diff --git a/scripts/sync-flash.sh b/scripts/sync-flash.sh index afa49707..540c7848 100755 --- a/scripts/sync-flash.sh +++ b/scripts/sync-flash.sh @@ -50,9 +50,9 @@ while true ; do echo "0) Multi flash card mode is `[[ $MULTI ]] && echo "on" || echo "off"`" echo "1) Directoy description is: \"$TITLE\"." if [[ ! $DRIVE ]] ; then - echo "a-z) type a drive letter." + echo "a-z) type a drive letter and start." else - echo "a-z) type a new drive letter." + echo "a-z) type a new drive letter and start." echo "Enter) copy drive ${DRIVE}" fi echo "2) build." @@ -125,7 +125,7 @@ while true ; do # exit interactive mode... - if [[ ! $INTERACTIVE || $LAST ]] ; then + if [[ ! $MULTI || ! $INTERACTIVE || $LAST ]] ; then break fi done diff --git a/ui/compatibility.js b/ui/compatibility.js index 3caff95e..cc213a09 100755 --- a/ui/compatibility.js +++ b/ui/compatibility.js @@ -48,7 +48,10 @@ if(window.CEF_dumpJSON != null){ window.osPath = function(p){ return path - .normalize(p.replace(/file:\/\/(\/[a-zA-Z]:|\/)/, '$1')) + // we can have two types of path: + // file:///some/path -> /some/path + // file:///X:/some/other/path -> X:/some/other/path + .normalize(p.replace(/file:\/+([a-zA-Z]:\/|\/)/, '$1')) } window.execPathPush = function(p){ process.env.PATH += ';' + path.normalize(path.dirname(process.execPath) + '/' + p)