Merge branch 'develop' into 'master'

Develop See merge request ADAS-Private/HEAppE/ClusterSetup!17
It4innovations · Dec 17, 2021 · 140dcf3 · 140dcf3
2 parents 07927fd + 5cf87ef
commit 140dcf3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.key_scripts/add_key.sh b/.key_scripts/add_key.sh
@@ -19,7 +19,7 @@ if ! grep -q -w "${conv_pub_key}" ${auth_keys_file}; then
 	pubkey=$(cat ${temp_file})
 	#rm -f ${temp_file}
 
-	keyline="command=\"~/.key_script/remote-cmd3.sh ${jobid}\",no-pty,no-port-forwarding,no-agent-forwarding,no-X11-forwarding ${conv_pub_key} key-temp-added-$(date +"%Y-%m-%d_%H-%M-%S")";
+	keyline="command=\"~/.key_scripts/remote-cmd3.sh ${jobid}\",no-pty,no-port-forwarding,no-agent-forwarding,no-X11-forwarding ${conv_pub_key} key-temp-added-$(date +"%Y-%m-%d_%H-%M-%S")";
 
 	#keyline="${conv_pub_key} dhi-temp-added-$(date +"%Y-%m-%d_%H-%M-%S")";
 	echo "${keyline}" >> ${auth_keys_file};

diff --git a/.key_scripts/test.sh b/.key_scripts/test.sh
@@ -6,4 +6,5 @@ do
 	echo "Iteration: ${i}"
 	sleep 30s
 done
-echo "some result" >> resultFile.txt
+echo "some result" >> resultFile.txt
+exit 0
diff --git a/.key_scripts/test_generic.sh b/.key_scripts/test_generic.sh
@@ -9,3 +9,4 @@ do
 	sleep 30s
 done
 echo "some result" >> resultFile.txt
+exit 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ do @@
     	sleep 30s
     done
     echo "some result" >> resultFile.txt
+    exit 0