flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix to last fix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-08-09 01:42:03 +04:00
parent f1d71d6e2c
commit c35d025a2f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/sync-flash.sh
View File

@ -50,9 +50,9 @@ while true ; do
echo "0) Multi flash card mode is `[[ $MULTI ]] && echo "on" || echo "off"`" echo "0) Multi flash card mode is `[[ $MULTI ]] && echo "on" || echo "off"`"
echo "1) Directoy description is: \"$TITLE\"." echo "1) Directoy description is: \"$TITLE\"."
if [[ ! $DRIVE ]] ; then if [[ ! $DRIVE ]] ; then
echo "a-z) type a drive letter." echo "a-z) type a drive letter and start."
else else
echo "a-z) type a new drive letter." echo "a-z) type a new drive letter and start."
echo "Enter) copy drive ${DRIVE}" echo "Enter) copy drive ${DRIVE}"
fi fi
echo "2) build." echo "2) build."
@ -125,7 +125,7 @@ while true ; do
# exit interactive mode... # exit interactive mode...
if [[ ! $INTERACTIVE || $LAST ]] ; then if [[ ! $MULTI || ! $INTERACTIVE || $LAST ]] ; then
break break
fi fi
done done

5
ui/compatibility.js
View File

@ -48,7 +48,10 @@ if(window.CEF_dumpJSON != null){
window.osPath = function(p){ window.osPath = function(p){
return path 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){ window.execPathPush = function(p){
process.env.PATH += ';' + path.normalize(path.dirname(process.execPath) + '/' + p) process.env.PATH += ';' + path.normalize(path.dirname(process.execPath) + '/' + p)