ADD: better bash support (reluctantly

1 files changed, 8 insertions, 4 deletions

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+set -o posix >/dev/null 2>&1 || true
 set -e
 
 WD="${WD:-/usr/local/mp}"
@@ -21,6 +22,9 @@ ok() {
         echo "ok: $1" >&2
 }
 
+if command -v dash >/dev/null 2>&1; then
+        alias sh='dash'
+fi
 if [ -f "$CFG" ]; then
         . "$CFG"
 fi
@@ -46,7 +50,7 @@ mp_add() {
         cd "$WD/$1" || die "failed changing directory to $WD/$1."
         
         if [ -f "pkg.conf" ]; then
-                . pkg.conf || die "unknown error involving $WD/$1/pkg.conf."
+                . ./pkg.conf || die "unknown error involving $WD/$1/pkg.conf."
         else
                 die "missing $WD/$1/pkg.conf."
         fi
@@ -61,7 +65,7 @@ mp_add() {
         fi 
 
         if [ -f "add.sh" ]; then
-                sh add.sh || die "$WD/$1/add.sh failed."
+                sh ./add.sh || die "$WD/$1/add.sh failed."
         else
                 die "missing $WD/$1/add.sh."
         fi
@@ -82,7 +86,7 @@ mp_del() {
         cd "$WD/$1" || die "failed changing directory to $WD/$1."
 
         if [ -f "pkg.conf" ]; then
-                . pkg.conf || die "unknown error involving $WD/$1/pkg.conf."
+                . ./pkg.conf || die "unknown error involving $WD/$1/pkg.conf."
         else
                 die "missing $WD/$1/pkg.conf."
         fi
@@ -97,7 +101,7 @@ mp_del() {
         fi
 
         if [ -f "del.sh" ]; then
-                sh del.sh || die "$WD/$1/del.sh failed."
+                sh ./del.sh || die "$WD/$1/del.sh failed."
         else
                 die "missing $WD/$1/del.sh."
         fi