From f2e1a388be1f1ddb26cd6c14aec0bff5a151b9f3 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 15 May 2017 14:33:58 +0200 Subject: [PATCH] Fix force-install-ok --- sub_scripts/testing_process.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh index f722e27..e99094b 100644 --- a/sub_scripts/testing_process.sh +++ b/sub_scripts/testing_process.sh @@ -362,7 +362,7 @@ is_install_failed () { then # If root installation worked, return root. echo root - elif [ $RESULT_check_sub_dir -eq 1 ] && [ $force_install_ok -ne 1 ] + elif [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ] then # If subdir installation worked or force_install_ok setted, return subdir. echo subdir @@ -601,7 +601,7 @@ CHECK_PUBLIC_PRIVATE () { if [ $i -eq 0 ] then # Check if root installation worked, or if force_install_ok is setted. - if [ $RESULT_check_root -eq 1 ] && [ $force_install_ok -ne 1 ] + if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ] then # Replace manifest key for path local check_path=/ @@ -616,7 +616,7 @@ CHECK_PUBLIC_PRIVATE () { elif [ $i -eq 1 ] then # Check if sub path installation worked, or if force_install_ok is setted. - if [ $RESULT_check_sub_dir -eq 1 ] && [ $force_install_ok -ne 1 ] + if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ] then # Replace manifest key for path local check_path=$test_path @@ -837,7 +837,7 @@ CHECK_COMMON_ERROR () { # Use a path according to previous succeeded installs if [ "$previous_install" = "subdir" ]; then local check_path=$test_path - elif [ "$previous_install" = "root" ]; then + else local check_path=/ fi replace_manifest_key "path" "$check_path" @@ -923,7 +923,7 @@ CHECK_BACKUP_RESTORE () { if [ $i -eq 0 ] then # Check if root installation worked, or if force_install_ok is setted. - if [ $RESULT_check_root -eq 1 ] && [ $force_install_ok -ne 1 ] + if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ] then # Replace manifest key for path local check_path=/ @@ -939,7 +939,7 @@ CHECK_BACKUP_RESTORE () { elif [ $i -eq 1 ] then # Check if sub path installation worked, or if force_install_ok is setted. - if [ $RESULT_check_sub_dir -eq 1 ] && [ $force_install_ok -ne 1 ] + if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ] then # Replace manifest key for path local check_path=$test_path