From e41bc77148b78e9987e793d4f986132b3269d27e Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 30 Nov 2016 21:21:02 +0100 Subject: [PATCH] Correction setup_user --- package_check.sh | 2 +- sub_scripts/lxc_check.sh | 4 ++-- sub_scripts/lxc_remove.sh | 2 +- sub_scripts/lxc_upgrade.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package_check.sh b/package_check.sh index ef96918..e38c3ce 100755 --- a/package_check.sh +++ b/package_check.sh @@ -13,7 +13,7 @@ echo "" if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$(echo $PWD/$(dirname "$0" | cut -d '.' -f2) | sed 's@/$@@')"; fi # Check user -if [ "$USER" != "$(cat "$script_dir/setup_user")" ] && test -e "$script_dir/setup_user"; then +if [ "$USER" != "$(cat "$script_dir/sub_scripts/setup_user")" ] && test -e "$script_dir/sub_scripts/setup_user"; then echo -e "\e[91mCe script doit être exécuté avec l'utilisateur $(cat "$script_dir/sub_scripts/setup_user")" echo -en "\e[0m" exit 0 diff --git a/sub_scripts/lxc_check.sh b/sub_scripts/lxc_check.sh index 1ae9325..50ccdd1 100755 --- a/sub_scripts/lxc_check.sh +++ b/sub_scripts/lxc_check.sh @@ -366,8 +366,8 @@ done ### Test l'accès ssh sur le conteneur echo -e "\e[1m\n> Test de l'accès ssh:\e[0m" # Check user -if [ "$USER" != "$(cat "$script_dir/../setup_user")" ] && test -e "$script_dir/../setup_user"; then - echo -e "\e[91mPour tester l'accès ssh, le script doit être exécuté avec l'utilisateur $(cat "$script_dir/../sub_scripts/setup_user")\e[0m" +if [ "$USER" != "$(cat "$script_dir/setup_user")" ] && test -e "$script_dir/setup_user"; then + echo -e "\e[91mPour tester l'accès ssh, le script doit être exécuté avec l'utilisateur $(cat "$script_dir/setup_user")\e[0m" exit 1 fi diff --git a/sub_scripts/lxc_remove.sh b/sub_scripts/lxc_remove.sh index 84fac4d..5616423 100755 --- a/sub_scripts/lxc_remove.sh +++ b/sub_scripts/lxc_remove.sh @@ -7,7 +7,7 @@ LXC_NAME=$(cat "$script_dir/lxc_build.sh" | grep LXC_NAME= | cut -d '=' -f2) # Check user if [ "$USER" != "$(cat "$script_dir/setup_user")" ] && test -e "$script_dir/setup_user"; then - echo -e "\e[91mCe script doit être exécuté avec l'utilisateur $(cat "$script_dir/sub_scripts/setup_user")" + echo -e "\e[91mCe script doit être exécuté avec l'utilisateur $(cat "$script_dir/setup_user")" echo -en "\e[0m" exit 0 fi diff --git a/sub_scripts/lxc_upgrade.sh b/sub_scripts/lxc_upgrade.sh index b10f3c7..15ee107 100755 --- a/sub_scripts/lxc_upgrade.sh +++ b/sub_scripts/lxc_upgrade.sh @@ -8,7 +8,7 @@ LXC_NAME=$(cat "$script_dir/lxc_build.sh" | grep LXC_NAME= | cut -d '=' -f2) # Check user if [ "$USER" != "$(cat "$script_dir/setup_user")" ] && test -e "$script_dir/setup_user"; then - echo -e "\e[91mCe script doit être exécuté avec l'utilisateur $(cat "$script_dir/sub_scripts/setup_user")" + echo -e "\e[91mCe script doit être exécuté avec l'utilisateur $(cat "$script_dir/setup_user")" echo -en "\e[0m" exit 0 fi