fix: fixes on custom install paths
This commit is contained in:
parent
b0750abd72
commit
b789f89d12
1 changed files with 3 additions and 3 deletions
|
|
@ -31,7 +31,7 @@ Options:
|
||||||
-c <path> Use this path as config"
|
-c <path> Use this path as config"
|
||||||
}
|
}
|
||||||
|
|
||||||
config_path=/etc/zpkg
|
config_path=$ZPKG_ROOT_PATH/etc/zpkg
|
||||||
|
|
||||||
while getopts ":hc:" opt;
|
while getopts ":hc:" opt;
|
||||||
do
|
do
|
||||||
|
|
@ -61,7 +61,7 @@ then
|
||||||
echo "Use '"'"'$(basename "$0") force'"'"' to force running as root"
|
echo "Use '"'"'$(basename "$0") force'"'"' to force running as root"
|
||||||
exit 10
|
exit 10
|
||||||
fi
|
fi
|
||||||
else
|
elif [ -z "$NOSUDO" ] ; then
|
||||||
which sudo >/dev/null 2>&1 || { echo "sudo not installed" >&2 && exit 11; }
|
which sudo >/dev/null 2>&1 || { echo "sudo not installed" >&2 && exit 11; }
|
||||||
sudo=sudo
|
sudo=sudo
|
||||||
fi
|
fi
|
||||||
|
|
@ -71,7 +71,7 @@ $sudo sh -c "echo \"# zpkg config file
|
||||||
SSH_ADDRESS=$SSH_ADDRESS
|
SSH_ADDRESS=$SSH_ADDRESS
|
||||||
HTTP_ADDRESS=$HTTP_ADDRESS
|
HTTP_ADDRESS=$HTTP_ADDRESS
|
||||||
COMPRESSION=$COMPRESSION
|
COMPRESSION=$COMPRESSION
|
||||||
PKG_PATH=pkg
|
PKG_PATH=/var/lib/zpkg
|
||||||
ALLOW_ROOT=false
|
ALLOW_ROOT=false
|
||||||
UPDATE_REMOVE=true\" > zpkg.conf"
|
UPDATE_REMOVE=true\" > zpkg.conf"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue