Merge branch 'development' of github-omc:OmnicomProduction-Japan/Script-Collections.GitHub.webhook-scripts into development

ReadMe.md

@@ -22,6 +22,8 @@ SUDO_USER="<SUDO USER NAME TO USE>"
 USE_SUDO=<1: use sudo, 0: no sudo used>
 ```
 
+The script will create the sudo user if needed automatically
+
 ### base_setup.sh
 
 as is, if the folder exists it will only copy the scripts, will not alter or change anything.

src/bin/base_setup.sh

@@ -39,6 +39,15 @@ if [ "$(whoami)" != "root" ]; then
 	error=1;
 fi;
 
+if [ -z "$(command -v setfacl)" ]; then
+	echo "Missing setfacl command, aborting";
+	error=1;
+fi;
+if [ -z "$(command -v git)" ]; then
+	echo "Missing git command, aborting";
+	error=1;
+fi;
+
 if [ $error -eq 1 ]; then
 	exit;
 fi;

src/bin/new_clone.sh

@@ -47,7 +47,7 @@ else
 	SSH_TEST=("${SUDO_COMMAND[@]}" "ssh" "${REMOTE_HOST}");
 	result=$("${SSH_TEST[@]}" 2>&1);
 	# this can be key or deploy key
-	validate_string="You've successfully authenticated with the "
+	validate_string="You've successfully authenticated"
 	if [[ "$result" != *"$validate_string"* ]]; then
 		echo "Could not connect to ${REMOTE_HOST}: ${result}";
 		error=1;