diff --git a/install/install_arch.sh b/install/install_arch.sh index e9e63d23..046ea4fe 100755 --- a/install/install_arch.sh +++ b/install/install_arch.sh @@ -22,9 +22,9 @@ fi # install basic dependencies -echo -e "\033[0;32mInstalling apt dependencies...\033[0m" +echo -e "\033[0;32mInstalling pacman dependencies...\033[0m" -pacman --needed --noconfirm -S git curl python python-pip tor > /dev/null +! ((pacman --needed --noconfirm -S git curl python python-pip tor > /dev/null) 2>&1 | grep -v warning 1>&2) | grep . # get the repository diff --git a/install/install_debian.sh b/install/install_debian.sh index b859e0fb..30e1f5bc 100755 --- a/install/install_debian.sh +++ b/install/install_debian.sh @@ -24,7 +24,7 @@ fi echo -e "\033[0;32mInstalling apt dependencies...\033[0m" -apt install -y git curl python3.7 python3-pip python3-setuptools tor > /dev/null +apt-get install -y git curl python3.7 python3-pip python3-setuptools tor > /dev/null # get the repository @@ -45,7 +45,7 @@ python3.7 -m pip install --no-input -r "$OUTPUT_DIR/requirements.txt" --require- # create nologin onionr user if not exists -id -u onionr &>/dev/null || useradd -r -s /sbin/nologin onionr +id -u onionr &>/dev/null || useradd -r -s /bin/false onionr chmod 755 "$OUTPUT_DIR" chown -R onionr:onionr "$OUTPUT_DIR" diff --git a/install/onionr b/install/onionr index 31fd58cc..ce980ef5 100755 --- a/install/onionr +++ b/install/onionr @@ -8,5 +8,5 @@ export OUTPUT_DIR=${OUTPUT_DIR:=/usr/share/onionr} export ONIONR_HOME=${ONIONR_HOME:=/etc/onionr} export LOG_DIR=${LOG_DIR:=/var/log/onionr} -cd "$OUTPUT_DIR" -exec su onionr -s /bin/sh -c "./onionr.sh ""$@""" +cd "$OUTPUT_DIR/onionr" +exec su onionr -s /bin/sh -c "python3.7 onionr.py ""$@"""