Fixed unixy path on win32, improved .blimp.conf template.

Göran Krampe
1 parent f9e9a47e
Showing 1 changed file with 51 additions and 25 deletions
blimp.nim
@@ -2,7 +2,7 @@ import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp, subexes, t
 # blimp is a little utility program for handling large files
 # in git repositories. Its inspired by git-fat and s3annex
-# but doesn't rely on S3 for storage - it uses sftp but
+# but doesn't rely on S3 for storage - it uses scp but
 # performs the file operations using externally configured commands.
 # It is a single binary without any dependencies.
 #
@@ -34,13 +34,14 @@ var
   areas = newTable[string, RemoteArea]()
   remoteArea: RemoteArea
-let
-  defaultConfig = """
+let defaultConfig = """
 [blimp]
 # Minimal version, otherwise stop
 # version = """ & versionAsString & """
-
-# Set your local blimpstore directory. You can use %home%, %cwd% and %gitroot% in paths, works cross platform.
+#
+# Set your local blimpstore directory. You can use %home%,
+# %cwd% and %gitroot% in paths, works cross platform.
+#
 # Example:
 #   # Place it inside the git clone
 #   blimpstore = "%gitroot%/.git/blimpstore"
@@ -50,21 +51,36 @@ let
 #
 # Default:
 #   # Place it in the users home directory
-#   blimpstore = "%home%/blimpstore"
-
-[areas]
-# This is where ypu define up/download areas. The area called "remote" is the
-# default area used unless --area is used.
-# $1 is the blimp filename, $2 is the remote url and $3 is the local blimpstore directory set above.
-remote-url = "blimpuser@some-server.com:/var/opt/blimpstore"
-remote-upload = "scp -pq $3/$1 $2/"
-remote-download = "scp -pq $2/$1 $3/"
-
-# Example area that can be used with upload/download commands and --area option.
-release-url = "blimpuser@some-server.com:/var/opt/release"
-release-upload = "scp -r $3/$1 $2/"
-release-download = "scp -r $2/$1 $3/"
-""" 
+blimpstore = "%home%/blimpstore"
+
+
+[remote]
+# The "remote" area represents the shared remote blimpstore.
+# This area is the default area used unless --area is used.
+url = "blimp@build.3dicc.com:/var/opt/blimpstore"
+
+# On Windows we rely on msysgit that includes scp.
+# On XP, make sure to put your ssh keys
+# in c:\Program Files\git\.ssh (slightly odd place)
+# On Win7 it uses c:\Users\gokr\.ssh - you can check with
+# "ssh -v somehost" to see where it looks for the keys.
+#
+# When expanding the command templates below:
+#   $1 is the blimp filename
+#   $2 is the area url above
+#   $3 is the local blimpstore directory
+upload = "scp -pq '$3/$1' '$2/'"
+download = "scp -pq '$2/$1' '$3/'"
+
+
+[release]
+# This area can be used with upload/download commands and --area option.
+# -r makes it possible to give directories as arguments for recursive handling.
+url = "blimp@build.3dicc.com:/var/opt/release"
+upload = "scp -r '$3/$1' '$2/'"
+download = "scp -r '$2/$1' '$3/'"
+"""
+
 proc cmd(cmd: string): string =
   try:
@@ -133,7 +149,7 @@ proc parseConfFile(filename: string) =
         of "blimp":
           case e.key
           of "blimpstore":
-            if blimpStore.isNil: blimpStore = e.value                  
+            if blimpStore.isNil: blimpStore = expandDirs(e.value)                
           of "version":
             if blimpVersion.isNil: blimpVersion = e.value
           else:
@@ -165,13 +181,24 @@ proc run(cmd: string): int =
   if verbose: echo(cmd)
   execCmd(cmd)
+# Perhaps not perfect but tries to convert c:\foo\bar to /c/foo/bar
+# but only if we are on windows, otherwise we do nothing.
+proc toUnixyPath(path: string): string =
+  when defined(windows):
+    if path.len > 1 and path[1] == ':':
+      let parts = path.split({':', '\\'})
+      result = "/" & parts.join("/")
+    else:
+      result = path
+  else:
+    result = path
 # Upload a file to the remote area
 proc uploadFile(filename, fromDir: string) =
   if remoteArea.isNil:
     echo("Remote area not set in configuration file, skipping uploading content:\n\t" & filename)
     return
-  let errorCode = run(format(remoteArea.upload, filename, remoteArea.url, fromDir))
+  let errorCode = run(format(remoteArea.upload, filename, remoteArea.url, toUnixyPath(fromDir)))
   if errorCode != 0:
     quit("Something went wrong uploading " & filename & " to " & remoteArea.url, 2)
@@ -179,7 +206,7 @@ proc uploadFile(filename, fromDir: string) =
 proc downloadFile(filename, toDir: string) =
   if remoteArea.isNil:
     quit("Remote area not set in configuration file, can not download content:\n\t" & filename)
-  let errorCode = run(format(remoteArea.download, filename, remoteArea.url, toDir))
+  let errorCode = run(format(remoteArea.download, filename, remoteArea.url, toUnixyPath(toDir)))
   if errorCode != 0:
     quit("Something went wrong downloading " & filename & " from " & remoteArea.url, 3)
@@ -187,7 +214,7 @@ proc downloadFile(filename, toDir: string) =
 proc remoteDeleteFile(filename: string) =
   if remoteArea.isNil:
     return
-  let errorCode = run(format(remoteArea.delete, filename, remoteArea.url, blimpStore))
+  let errorCode = run(format(remoteArea.delete, filename, remoteArea.url, toUnixyPath(blimpStore)))
   if errorCode != 0:
     quit("Something went wrong deleting " & filename & " from " & remoteArea.url, 3)
@@ -454,7 +481,6 @@ 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)