From 5ae8dd672c7442f3cfa3a1dd12b2159caeb3892b Mon Sep 17 00:00:00 2001 From: David Kebler Date: Tue, 27 Feb 2024 19:04:33 -0800 Subject: [PATCH] remove echo so install commences --- install/install.sh | 6 +++--- modules/uci-shell-install.lib | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/install.sh b/install/install.sh index e45bbb3..e8f3cd8 100644 --- a/install/install.sh +++ b/install/install.sh @@ -7,9 +7,9 @@ uci_bash_shell_install () { # export BASH_SHELL_BASE="$(dirname "$(cd "$(dirname "${BASH_SOURCE:-$0}")" >/dev/null 2>&1 ; pwd -P )")" echo "Detected The UCI BASH Shell install directory: BASH_INSTALL_DIR=$install_dir" echo "Detected The UCI BASH Shell base directory: BASH_SHELL_BASE=$BASH_SHELL_BASE" - [[ $EUID -ne 0 ]] && usesudo=sudo - $usesudo -m $SHELL $install_dir/scripts/copy-etc.sh - $usesudo -m $SHELL $install_dir/scripts/copy-root.sh + [[ $EUID -ne 0 ]] && usesudo="sudo -m" + $usesudo $SHELL $install_dir/scripts/copy-etc.sh + $usesudo $SHELL $install_dir/scripts/copy-root.sh [[ $1 ]] && [[ $(id -u $1 2> /dev/null) ]] && $usesudo -m $SHELL $install_dir/scripts/copy-user.sh "$@" } diff --git a/modules/uci-shell-install.lib b/modules/uci-shell-install.lib index b4c795d..b8c0b35 100644 --- a/modules/uci-shell-install.lib +++ b/modules/uci-shell-install.lib @@ -47,7 +47,7 @@ install_shell_base () { chown -R ${1:-$1000}:${1:-1000} /shell chmod -R +r /shell - echo /bin/bash /shell/base/install/install.sh ${1:-1000} + /bin/bash /shell/base/install/install.sh ${1:-1000} } # # if script was executed then call the function