diff --git a/check.bash b/check.bash index 60352b0..7c9a845 100755 --- a/check.bash +++ b/check.bash @@ -5,10 +5,13 @@ if [ -f /usr/bin/makeself.sh ]; then # makeself is installed echo "makeself is installed, good" - + mkslf=$(which makeself.sh) else - - # makeself is not installed + if [ -f /usr/bin/makeself ]; then + echo "makeself is installed, good" + mkslf=$(which makeself) + else echo "makeself is not installed please install via this application" - sleep 3 + sleep 3 + fi fi \ No newline at end of file diff --git a/syssetup.bash b/syssetup.bash index d8b2a22..e5ef858 100755 --- a/syssetup.bash +++ b/syssetup.bash @@ -1,6 +1,6 @@ #!/bin/bash -set -x +# set -x if [ "$(id -u)" != "0" ]; then echo "You should run this script as root" @@ -60,7 +60,7 @@ fi arcdir=$(mktemp -d) echo $arcdir - mkslf=$(which makeself.sh) + echo $mkslf $mkslf --gzip $tmpdir $arcdir/restore.run "SFX archive for restoration" ./restore.bash cp $arcdir/restore.run ./