diff options
| author | Lamont Granquist <lamont@chef.io> | 2020-07-14 21:47:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 21:47:54 -0700 |
| commit | 96c620f51e39bf53f883bfe9c5a1733c9cdae74b (patch) | |
| tree | 28638e0ef503106db34a7845c0eecca44d2566a9 | |
| parent | ed1e4a3549e7adc0999c946dab7112f3518a53fe (diff) | |
| parent | 386b3ffe891c4a0a12e84b2a0e9160731b522d59 (diff) | |
| download | chef-96c620f51e39bf53f883bfe9c5a1733c9cdae74b.tar.gz | |
Merge pull request #10161 from chef/smartos
Remove smartos detection / support in our package scripts
| -rwxr-xr-x | omnibus/package-scripts/angrychef/postinst | 9 | ||||
| -rwxr-xr-x | omnibus/package-scripts/angrychef/postrm | 8 | ||||
| -rwxr-xr-x | omnibus/package-scripts/chef/postinst | 9 | ||||
| -rwxr-xr-x | omnibus/package-scripts/chef/postrm | 8 |
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" |