Browse code

fix abort not aborting

Nat! authored on 10-07-2017 17:56:45
Showing 4 changed files
... ...
@@ -1,3 +1,7 @@
1
+### 3.8.4
2
+
3
+* fix `Abort now (y/N) > y` not really aborting
4
+
1 5
 ### 3.8.3
2 6
 
3 7
 * fix upgrade and status for tar/zip SCM, which previously errored out
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=8
34
-MULLE_EXECUTABLE_VERSION_PATCH=3
34
+MULLE_EXECUTABLE_VERSION_PATCH=4
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -285,7 +285,7 @@ _git_clone()
285 285
    options=""
286 286
    if [ ! -z "${branch}" ]
287 287
    then
288
-      log_info "Cloning branch ${C_RESET_BOLD}$branch${C_INFO} of ${C_MAGENTA}${C_BOLD}${url}${C_INFO} into \"${stashdir}\" ..."
288
+      log_info "Cloning ${C_RESET_BOLD}$branch${C_INFO} of ${C_MAGENTA}${C_BOLD}${url}${C_INFO} into \"${stashdir}\" ..."
289 289
       options="-b ${branch}"
290 290
    else
291 291
       log_info "Cloning ${C_MAGENTA}${C_BOLD}${url}${C_INFO} into \"${stashdir}\" ..."
... ...
@@ -880,8 +880,8 @@ tar_unpack()
880 880
       tarcommand="xf"
881 881
 
882 882
       case "${UNAME}" in
883
-         darwin)  
884
-            # don't need it 
883
+         darwin)
884
+            # don't need it
885 885
          ;;
886 886
 
887 887
          *)
... ...
@@ -138,7 +138,9 @@ warn_scripts_main()
138 138
    [ -z "${MULLE_BOOTSTRAP_SETTINGS_SH}" ] && . mulle-bootstrap-settings.sh
139 139
 
140 140
    local  dont_warn_scripts
141
+   local rval
141 142
 
143
+   rval=0
142 144
    #
143 145
    # if MULLE_FLAG_ANSWER is YES
144 146
    # then don't warn either
... ...
@@ -149,8 +151,13 @@ warn_scripts_main()
149 151
    then
150 152
       log_verbose "Script checking disabled"
151 153
    else
152
-      warn_scripts "$@"
154
+      if ! warn_scripts "$@"
155
+      then
156
+         rval=1
157
+      fi
153 158
    fi
154 159
 
155
-   log_debug "::: warn_scripts end :::"
160
+   log_debug "::: warn_scripts end:::"
161
+
162
+   return $rval
156 163
 }