From 7d872c84669bba583fe8a5ee7c1fdf0c1d9a28f5 Mon Sep 17 00:00:00 2001 From: zawz Date: Tue, 26 May 2020 11:29:59 +0200 Subject: [PATCH] Fix install for root --- server_scripts/gen_install.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server_scripts/gen_install.sh b/server_scripts/gen_install.sh index 0552b3f..ea99a60 100755 --- a/server_scripts/gen_install.sh +++ b/server_scripts/gen_install.sh @@ -47,22 +47,26 @@ done shift $((OPTIND-1)) -if [ "$(id | cut -d"=" -f2 | cut -d"(" -f1)" -eq 0 ] +if [ "$(id | cut -d"=" -f2 | cut -d"(" -f1)" -eq 0 ] && [ "$1" != "force" ] then - echo "Cannot run as root" > /dev/stderr + echo "Cannot run as root" >&2 + echo "Use '$(basename "$0") force' to force running as root" exit 10 +else + which sudo >/dev/null || { echo "sudo not installed" >&2 && exit 11; } + sudo=sudo fi # Generate conf file -sudo sh -c "{ +$sudo sh -c "{ echo SSH_ADDRESS=$SSH_USER@$SSH_ADDR echo HTTP_ADDRESS=$HTTP_ADDR/$HTTP_PATH echo PKG_PATH=pkg } > zpkg.conf" # install config file -sudo mkdir -p "$config_path" || exit $? -sudo mv zpkg.conf "$config_path" || exit $? +$sudo mkdir -p "$config_path" || exit $? +$sudo mv zpkg.conf "$config_path" || exit $? # download zpkg tmpdir=/tmp/zpkg$(random_string 5)