From b713cdb303660a3a786f744b82040627ba798a29 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniack_crudelis@yahoo.fr>
Date: Sat, 17 Sep 2016 18:18:56 +0200
Subject: [PATCH] Update lock user

---
 package_check.sh           | 4 ++--
 sub_scripts/lxc_remove.sh  | 4 ++--
 sub_scripts/lxc_upgrade.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package_check.sh b/package_check.sh
index 5077f3d..59169b2 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -10,10 +10,10 @@
 echo ""
 
 # Récupère le dossier du script
-if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$PWD/$(dirname "$0" | cut -d '.' -f2)"; fi
+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/sub_scripts/setup_user")" ]; then
+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 -en "\e[0m"
 	exit 0
diff --git a/sub_scripts/lxc_remove.sh b/sub_scripts/lxc_remove.sh
index a978cf8..84fac4d 100755
--- a/sub_scripts/lxc_remove.sh
+++ b/sub_scripts/lxc_remove.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Récupère le dossier du script
-if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$PWD/$(dirname "$0" | cut -d '.' -f2)"; fi
+if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$(echo $PWD/$(dirname "$0" | cut -d '.' -f2) | sed 's@/$@@')"; fi
 
 LXC_NAME=$(cat "$script_dir/lxc_build.sh" | grep LXC_NAME= | cut -d '=' -f2)
 
 # Check user
-if [ "$USER" != "$(cat "$script_dir/sub_scripts/setup_user")" ]; then
+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 -en "\e[0m"
 	exit 0
diff --git a/sub_scripts/lxc_upgrade.sh b/sub_scripts/lxc_upgrade.sh
index 4c94a39..b10f3c7 100755
--- a/sub_scripts/lxc_upgrade.sh
+++ b/sub_scripts/lxc_upgrade.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Récupère le dossier du script
-if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$PWD/$(dirname "$0" | cut -d '.' -f2)"; fi
+if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$(echo $PWD/$(dirname "$0" | cut -d '.' -f2) | sed 's@/$@@')"; fi
 
 PLAGE_IP=$(cat "$script_dir/lxc_build.sh" | grep PLAGE_IP= | cut -d '"' -f2)
 LXC_NAME=$(cat "$script_dir/lxc_build.sh" | grep LXC_NAME= | cut -d '=' -f2)
 
 # Check user
-if [ "$USER" != "$(cat "$script_dir/sub_scripts/setup_user")" ]; then
+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 -en "\e[0m"
 	exit 0