From 5cd1023e6e3ebb500070014c436f89bf33d1d0b2 Mon Sep 17 00:00:00 2001 From: Simon Let Date: Mon, 16 Dec 2019 02:50:13 +0100 Subject: [PATCH] minor fixes --- scripts/install.sh | 3 ++- scripts/rawinstall.sh | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 62cec6b..e59f601 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -78,8 +78,9 @@ fi echo +echo "Continue with installation? (Any key to CONTINUE / Ctrl+C to ABORT)" +echo echo "Creating directories ..." -# INSTALLATION mkdir_if_not_exists() { if [ ! -d "$1" ]; then diff --git a/scripts/rawinstall.sh b/scripts/rawinstall.sh index dcafa99..c2f1651 100755 --- a/scripts/rawinstall.sh +++ b/scripts/rawinstall.sh @@ -94,13 +94,15 @@ echo "DONE" echo if ! scripts/install.sh; then + if [ $? != 130 ]; then + echo + echo "INSTALLATION FAILED!" + echo "I'm sorry for the inconvenience." + echo + echo "Please create an issue: https://github.com/curusarn/resh/issues" + fi echo - echo "INSTALLATION FAILED!" - echo "I'm sorry for the inconvenience." - echo - echo "Please create an issue: https://github.com/curusarn/resh/issues" - echo - echo "You can rerun the installation by executing: (this will skip downloading the files)" + echo "You can rerun the installation by executing: (this will skip downloading)" echo echo "cd $PWD && scripts/install.sh" exit 1