scripts/functions: fix debug-shell

Properly catch resuming the build when continuing past the
failed command.

The 'case ;;&' construct is a bash4ism. Get rid of it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
(transplanted from 2af20cfd210bac338ec18d774458c84fd585ef07)

.hgtags

@@ -30,3 +30,4 @@ c71b4f4da4b46aa83e6c013208731edfffd249a1 crosstool-ng-0.0.4
 ce34b7cd6509906de6885c084dbef7ddecd603c6 crosstool-ng-1.1.3a
 e016efb7036c14f86e1592114e621cfadeaf714c crosstool-ng-0.0.2
 fec15dd785b1ab52e15a350665362c3f58852931 crosstool-ng-0.1.0
+f36a98f6374934208c2e05afed753368ddba32be crosstool-ng-1.17.0

.version

@@ -1 +1 @@
-hg
+1.17.0+hg

scripts/build/libc/glibc-eglibc.sh-common

@@ -460,7 +460,7 @@ do_libc_backend_once() {
             # EGLIBC doesn't have a install-{pdf.html}, and older
             # versions leave the manuals in the source directory
             CT_DoExecLog ALL mkdir -p ${CT_PREFIX_DIR}/share/doc
-            if [ ${CT_LIBC_EGLIBC_2_16_or_later} = "y" ]; then
+            if [ "${CT_LIBC_EGLIBC_2_16_or_later}" = "y" ]; then
                 CT_DoExecLog ALL cp -av manual/*.pdf manual/libc \
                     ${CT_PREFIX_DIR}/share/doc
             else

scripts/crosstool-NG.sh.in

@@ -66,6 +66,9 @@ for d in            \
             *" "*)
                 CT_Abort "'CT_${d}_DIR'='${dir}' contains a space in it.\nDon't use spaces in paths, it breaks things."
                 ;;
+            *:*)
+                CT_Abort "'CT_${d}_DIR'='${dir}' contains a colon in it.\nDon't use colons in paths, it breaks things."
+                ;;
         esac
 done
 

scripts/functions

@@ -71,16 +71,15 @@ CT_OnError() {
                                 printf "\nRe-trying last command.\n\n"
                                 break
                             fi
-                            ;;&
-                        3)  break;;
-                        *)  printf "\nPlease exit with one of these values:\n"
-                            printf "    1  fixed, continue with next build command\n"
-                            if [ -n "${cur_cmd}" ]; then
-                                printf "    2  repeat this build command\n"
-                            fi
-                            printf "    3  abort build\n"
                             ;;
+                        3)  break;;
                     esac
+                    printf "\nPlease exit with one of these values:\n"
+                    printf "    1  fixed, continue with next build command\n"
+                    if [ -n "${cur_cmd}" ]; then
+                        printf "    2  repeat this build command\n"
+                    fi
+                    printf "    3  abort build\n"
                 done
                 exit $result
             )
@@ -88,7 +87,7 @@ CT_OnError() {
             # Restore the trap handler
             eval "${old_trap}"
             case "${result}" in
-                1)  rm -f "${CT_WORK_DIR}/backtrace"; return;;
+                1)  rm -f "${CT_WORK_DIR}/backtrace"; touch "${CT_BUILD_DIR}/skip"; return;;
                 2)  rm -f "${CT_WORK_DIR}/backtrace"; touch "${CT_BUILD_DIR}/repeat"; return;;
                 # 3 is an abort, continue...
             esac
@@ -258,7 +257,12 @@ CT_DoExecLog() {
         "${@}" 2>&1 |CT_DoLog "${level}"
         ret="${?}"
         if [ -f "${CT_BUILD_DIR}/repeat" ]; then
+            rm -f "${CT_BUILD_DIR}/repeat"
             continue
+        elif [ -f "${CT_BUILD_DIR}/skip" ]; then
+            rm -f "${CT_BUILD_DIR}/skip"
+            ret=0
+            break
         else
             break
         fi