summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-07-14 21:00:20 -0700
committerTim Smith <tsmith84@gmail.com>2020-07-14 21:00:20 -0700
commit386b3ffe891c4a0a12e84b2a0e9160731b522d59 (patch)
tree28638e0ef503106db34a7845c0eecca44d2566a9
parented1e4a3549e7adc0999c946dab7112f3518a53fe (diff)
downloadchef-386b3ffe891c4a0a12e84b2a0e9160731b522d59.tar.gz
Remove smartos detection / support in our package scripts
We don't produce smartos packages and we never have. There's no reason to carry around this baggage. Signed-off-by: Tim Smith <tsmith@chef.io>
-rwxr-xr-xomnibus/package-scripts/angrychef/postinst9
-rwxr-xr-xomnibus/package-scripts/angrychef/postrm8
-rwxr-xr-xomnibus/package-scripts/chef/postinst9
-rwxr-xr-xomnibus/package-scripts/chef/postrm8
4 files changed, 4 insertions, 30 deletions
diff --git a/omnibus/package-scripts/angrychef/postinst b/omnibus/package-scripts/angrychef/postinst
index 5cf14075b9..2dccceff6c 100755
--- a/omnibus/package-scripts/angrychef/postinst
+++ b/omnibus/package-scripts/angrychef/postinst
@@ -26,14 +26,7 @@ is_darwin()
uname -v | grep "^Darwin" 2>&1 >/dev/null
}
-is_smartos()
-{
- uname -v | grep "^joyent" 2>&1 >/dev/null
-}
-
-if is_smartos; then
- PREFIX="/opt/local"
-elif is_darwin; then
+if is_darwin; then
PREFIX="/usr/local"
mkdir -p "$PREFIX/bin"
else
diff --git a/omnibus/package-scripts/angrychef/postrm b/omnibus/package-scripts/angrychef/postrm
index 0963b1d901..c8e057cb30 100755
--- a/omnibus/package-scripts/angrychef/postrm
+++ b/omnibus/package-scripts/angrychef/postrm
@@ -7,10 +7,6 @@
# this programming language. do not touch.
# - if you are under 40, get peer review from your elders.
-is_smartos() {
- uname -v | grep "^joyent" 2>&1 >/dev/null
-}
-
is_darwin() {
uname -v | grep "^Darwin" 2>&1 >/dev/null
}
@@ -24,9 +20,7 @@ is_suse() {
fi
}
-if is_smartos; then
- PREFIX="/opt/local"
-elif is_darwin; then
+if is_darwin; then
PREFIX="/usr/local"
else
PREFIX="/usr"
diff --git a/omnibus/package-scripts/chef/postinst b/omnibus/package-scripts/chef/postinst
index c1c5272902..d4e12a239e 100755
--- a/omnibus/package-scripts/chef/postinst
+++ b/omnibus/package-scripts/chef/postinst
@@ -26,14 +26,7 @@ is_darwin()
uname -v | grep "^Darwin" 2>&1 >/dev/null
}
-is_smartos()
-{
- uname -v | grep "^joyent" 2>&1 >/dev/null
-}
-
-if is_smartos; then
- PREFIX="/opt/local"
-elif is_darwin; then
+if is_darwin; then
PREFIX="/usr/local"
mkdir -p "$PREFIX/bin"
else
diff --git a/omnibus/package-scripts/chef/postrm b/omnibus/package-scripts/chef/postrm
index 0963b1d901..c8e057cb30 100755
--- a/omnibus/package-scripts/chef/postrm
+++ b/omnibus/package-scripts/chef/postrm
@@ -7,10 +7,6 @@
# this programming language. do not touch.
# - if you are under 40, get peer review from your elders.
-is_smartos() {
- uname -v | grep "^joyent" 2>&1 >/dev/null
-}
-
is_darwin() {
uname -v | grep "^Darwin" 2>&1 >/dev/null
}
@@ -24,9 +20,7 @@ is_suse() {
fi
}
-if is_smartos; then
- PREFIX="/opt/local"
-elif is_darwin; then
+if is_darwin; then
PREFIX="/usr/local"
else
PREFIX="/usr"