Skip to content
Snippets Groups Projects
Commit 373c9406 authored by Jan Ebert's avatar Jan Ebert
Browse files

Fix awkward script exits

This way we don't quit an interactive session.
parent fbe9d453
Branches
No related tags found
No related merge requests found
......@@ -12,19 +12,19 @@ venv_dir="$curr_dir"/env-"$SYSTEMNAME"
module --force purge
if ! [ -f "$curr_dir"/modules.sh ]; then
echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
exit 1
return 1
fi
source "$curr_dir"/modules.sh
if ! [ -d "$venv_dir" ]; then
echo "Please manually execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
"on a login node to create the \`venv\`."
exit 1
return 1
elif ! [ -f "$venv_dir"/bin/activate ]; then
echo "Something seems to be wrong with the \`venv\` at \`$venv_dir\`." \
"Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
"execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
"on a login node to re-create the \`venv\`."
exit 1
return 1
fi
source "$venv_dir"/bin/activate
......@@ -11,7 +11,7 @@ if ! [ -d "$venv_dir" ]; then
module --force purge
if ! [ -f "$curr_dir"/modules.sh ]; then
echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
exit 1
return 1
fi
source "$curr_dir"/modules.sh
......@@ -22,7 +22,7 @@ if ! [ -d "$venv_dir" ]; then
"Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
"execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
"on a login node to re-create the \`venv\`."
exit 1
return 1
fi
source "$venv_dir"/bin/activate
......@@ -30,7 +30,7 @@ if ! [ -d "$venv_dir" ]; then
if ! [ -f "$curr_dir"/requirements.txt ]; then
echo "Cannot find \`$curr_dir/requirements.txt\`;" \
"its existence is required."
exit 1
return 1
fi
python -m pip install -r "$curr_dir"/requirements.txt
......
......@@ -12,19 +12,19 @@ venv_dir="$curr_dir"/env-"$SYSTEMNAME"
module --force purge
if ! [ -f "$curr_dir"/modules.sh ]; then
echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
exit 1
return 1
fi
source "$curr_dir"/modules.sh
if ! [ -d "$venv_dir" ]; then
echo "Please manually execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
"on a login node to create the \`venv\`."
exit 1
return 1
elif ! [ -f "$venv_dir"/bin/activate ]; then
echo "Something seems to be wrong with the \`venv\` at \`$venv_dir\`." \
"Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
"execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
"on a login node to re-create the \`venv\`."
exit 1
return 1
fi
source "$venv_dir"/bin/activate
......@@ -11,7 +11,7 @@ if ! [ -d "$venv_dir" ]; then
module --force purge
if ! [ -f "$curr_dir"/modules.sh ]; then
echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
exit 1
return 1
fi
source "$curr_dir"/modules.sh
......@@ -22,7 +22,7 @@ if ! [ -d "$venv_dir" ]; then
"Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
"execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
"on a login node to re-create the \`venv\`."
exit 1
return 1
fi
source "$venv_dir"/bin/activate
......@@ -30,7 +30,7 @@ if ! [ -d "$venv_dir" ]; then
if ! [ -f "$curr_dir"/requirements.txt ]; then
echo "Cannot find \`$curr_dir/requirements.txt\`;" \
"its existence is required."
exit 1
return 1
fi
python -m pip install -r "$curr_dir"/requirements.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment