Fixes discovered while testing on windows XP.

Göran Krampe
1 parent 3e2f4c14
Showing 1 changed file with 23 additions and 15 deletions
blimp.nim
@@ -41,10 +41,10 @@ password = &quot;some-good-rsync-password-for-blimpuser&quot;
 # The following three formats should not need editing.
 # $1 is the blimp filename, $2 is remote location and $3 is the local blimpstore directory set above.
 # NOTE: The password-file .blimp.pass will be created by blimp on every command, do not remove that option.
-upload = "rsync --password-file $3/.blimp.pass -avzP $3/$1 $2/"
-download = "rsync --password-file $3/.blimp.pass -avzP $2/$1 $3/"
+upload = "rsync --password-file $3/.blimp.pass -azP $3/$1 $2/"
+download = "rsync --password-file $3/.blimp.pass -azP $2/$1 $3/"
 # This deletes a single file from destination, that is already deleted in source. Yeah... insane! But it works.
-delete = "rsync --password-file $3/.blimp.pass -dv --delete --existing --ignore-existing --include '$1' --exclude '*' $3/ $2"
+delete = "rsync --password-file $3/.blimp.pass -d --delete --existing --ignore-existing --include '$1' --exclude '*' $3/ $2"
 [blimp]
 # Minimal version, otherwise stop
@@ -53,7 +53,12 @@ delete = &quot;rsync --password-file $3/.blimp.pass -dv --delete --existing --ignore-
 proc cmd(cmd: string): string =
   try:
-    let tup = execCmdEx(cmd)
+    # Otherwise pipes will not work for git commands etc
+    when defined(windows):
+      let tup = execCmdEx("cmd /c \"" & cmd & "\"")
+    else:
+      let tup = execCmdEx(cmd) 
+    #echo "cmd: " & $cmd & "err:" & $tup[1]
     if tup[1] == 0:
       result = strip(tup[0])
     else:
@@ -139,7 +144,7 @@ proc run(cmd: string): auto =
 proc rsyncRun(cmd: string): auto =
   if not rsyncPassword.isNil:
     writeFile(blimpStore / ".blimp.pass", rsyncPassword)
-    if execCmd("chmod 600 " & blimpStore / ".blimp.pass") != 0:
+    if execCmd("chmod 600 \"" & blimpStore / ".blimp.pass\"") != 0:
       quit("Failed to chmod 600 " & blimpStore / ".blimp.pass")
   run(cmd)
@@ -244,14 +249,14 @@ proc deflate(filename: string) =
 # Iterator over all deflated files in the git clone
 iterator allDeflated() =
-  let filenames = cmd("git ls-files " & gitRootDir).split('\l')
+  let filenames = cmd("git ls-files " & gitRootDir).split({'\l', '\c'})
   for fn in filenames:
     if not blimpFilename(fn).isNil:
       yield fn
 # Iterator over all files matching the blimp filter in the git clone
 iterator allFiltered() =
-  let lines = cmd("git ls-files | git check-attr --stdin filter").split('\l')
+  let lines = cmd("git ls-files | git check-attr --stdin filter").split({'\l', '\c'})
   for line in lines:
     let status = line.split(':')
     if strip(status[2]) == "blimp":
@@ -310,11 +315,11 @@ proc `$`(x: string): string =
 proc dumpConfig() =
   echo "\nDump of configuration:"
-  echo "\tblimpStore: " & blimpStore
-  echo "\tremoteBlimpStore: " & remoteBlimpStore
-  echo "\tuploadCommandFormat: " & uploadCommandFormat
-  echo "\tdownloadCommandFormat: " & downloadCommandFormat
-  echo "\tdeleteCommandFormat: " & deleteCommandFormat
+  echo "\tblimpStore: " & $blimpStore
+  echo "\tremoteBlimpStore: " & $remoteBlimpStore
+  echo "\tuploadCommandFormat: " & $uploadCommandFormat
+  echo "\tdownloadCommandFormat: " & $downloadCommandFormat
+  echo "\tdeleteCommandFormat: " & $deleteCommandFormat
   echo "\trsyncPassword: " & $rsyncPassword
   echo "\tblimpVersion: " & $blimpVersion
   echo "\n"
@@ -418,6 +423,7 @@ homeDir = getHomeDir()
 homeDir = homeDir[0.. -2] # Not sure why it keeps a trailing "/" on Linux
 currentDir = getCurrentDir()
 gitRootDir = gitRoot()
+echo gitRootDir
 # Using lapp to get args, on parsing failure this will show usage automatically
 var args = parse(synopsis)
@@ -442,13 +448,15 @@ parseConfFile(currentDir / &quot;.blimp.conf&quot;)
 if not gitRootDir.isNil and gitRootDir != currentDir:
   parseConfFile(gitRootDir / ".blimp.conf")
+if existsDir(homeDir / "blimpstore"):
+  parseConfFile(homeDir / "blimpstore" / ".blimp.conf")
+
+parseConfFile(homeDir / ".blimp.conf")
+
 # If we haven't gotten a blimpstore yet, we set a default one
 if blimpStore.isNil:
   blimpStore = homeDir / "blimpstore"
-if existsDir(blimpStore):
-  parseConfFile(blimpStore / ".blimp.conf")
-parseConfFile(homeDir / ".blimp.conf")
 # Let's just show what we have :)
 if verbose: dumpConfig()