diff --git a/pkg.info b/pkg.info index a96d08c..549d956 100644 --- a/pkg.info +++ b/pkg.info @@ -1,7 +1,7 @@ name: dash description: POSIX-compliant implementation of /bin/sh that aims to be as small as possible version: 0.5.13.2 -revision: 1 +revision: 2 url: http://gondor.apana.org.au/~herbert/dash/ license: BSD-3-Clause maintainers: diff --git a/post_install.sh b/post_install.sh index 5552fe9..794ec7b 100644 --- a/post_install.sh +++ b/post_install.sh @@ -1,7 +1,10 @@ #!/bin/sh -SHELL="/bin/dash" +SHELLS="/bin/dash /usr/bin/dash" -if ! grep "${SHELL}" "$BPM_ROOT"/etc/shells; then - echo "${SHELL}" | tee -a "$BPM_ROOT"/etc/shells -fi +for _shell in $SHELLS; do + if ! grep -q "^${_shell}\$" /etc/shells; then + echo "Adding '$_shell' to /etc/shells..." + echo "$_shell" | tee -a /etc/shells 1>/dev/null + fi +done diff --git a/post_remove.sh b/post_remove.sh index 01d886c..e71f1e2 100644 --- a/post_remove.sh +++ b/post_remove.sh @@ -1,7 +1,10 @@ #!/bin/sh -SHELL="/bin/dash" +SHELLS="/bin/dash /usr/bin/dash" -if grep "${SHELL}" "$BPM_ROOT"/etc/shells; then - sed -i "\|${SHELL}|d" "$BPM_ROOT"/etc/shells -fi +for _shell in $SHELLS; do + if grep -q "^${_shell}\$" /etc/shells; then + echo "Removing '$_shell' from /etc/shells..." + sed -i "\|^${_shell}\$|d" /etc/shells + fi +done diff --git a/post_update.sh b/post_update.sh new file mode 100644 index 0000000..794ec7b --- /dev/null +++ b/post_update.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +SHELLS="/bin/dash /usr/bin/dash" + +for _shell in $SHELLS; do + if ! grep -q "^${_shell}\$" /etc/shells; then + echo "Adding '$_shell' to /etc/shells..." + echo "$_shell" | tee -a /etc/shells 1>/dev/null + fi +done