merged building on systems without bash from manevich

6 files changed, 8 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index f5e52979f..167dc0cf5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,7 +138,7 @@ realinstall:
         install -c -m 0644 .etc/mupen64plus.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/disable-terminals.inc $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/lxterminal.profile $(DESTDIR)/$(sysconfdir)/firejail/.
-        bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
+        sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
         rm -fr .etc
         # man pages
         rm -f firejail.1.gz
diff --git a/install.sh b/install.sh
index b3ddf0423..a8a506096 100755
--- a/install.sh
+++ b/install.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
 echo "installing..."
diff --git a/mkasc.sh b/mkasc.sh
index 09c7a35d4..2c9836f17 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 echo "Calculationg SHA256 for all files in /transfer - firejail version $1"
 
diff --git a/mkdeb.sh b/mkdeb.sh
index d406e18cc..71c3b9a04 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 # based on http://tldp.org/HOWTO/html_single/Debian-Binary-Package-Building-HOWTO/
 # a code archive should already be available
 
 TOP=`pwd`
 CODE_ARCHIVE="$1-$2.tar.bz2"
 CODE_DIR="$1-$2"
-INSTALL_DIR+="$CODE_DIR/debian"
-DEBIAN_CTRL_DIR+="$CODE_DIR/debian/DEBIAN"
+INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
+DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN"
 
 echo "*****************************************"
 echo "code archive: $CODE_ARCHIVE"
diff --git a/mketc.sh b/mketc.sh
index cc7f0c440..f44238968 100755
--- a/mketc.sh
+++ b/mketc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 rm -fr .etc
 mkdir .etc
 
diff --git a/mkman.sh b/mkman.sh
index 5cc79d277..e36475aad 100755
--- a/mkman.sh
+++ b/mkman.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 sed "s/VERSION/$1/g" $2 > $3
 MONTH=`LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%b`