Merge pull request #290 from achilleas-k/windows-global-cmd

Windows global cmd

Author: mpsonntag

.travis.yml

@@ -13,11 +13,11 @@ env:
 
 matrix:
   include:
-    - go: "1.13.x"
+    - go: "1.14.x"
       os: linux
     - go: tip
       os: linux
-    - go: "1.13.x"
+    - go: "1.14.x"
       os: osx
       addons:
         homebrew:

appveyor.yml

@@ -3,7 +3,7 @@ build: off
 
 clone_folder: C:\gopath\src\github.com\G-Node\gin-cli
 
-stack: go 1.12
+stack: go 1.14
 
 environment:
   SRCDIR: C:\gopath\src\github.com\G-Node\gin-cli

dorelease.py renamed to dorelease

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
 # Copyright (c) 2017, German Neuroinformatics Node (G-Node)
 #
 # All rights reserved.
@@ -186,12 +188,9 @@ def get_git_annex_for_windows():
     """
     Download the git annex for windows installer.
     """
-    # win_git_annex_url = ("https://downloads.kitenet.net/git-annex/windows/"
-    #                      "current/git-annex-installer.exe")
-    # return download(win_git_annex_url)
-    # fixing windows installer version (again)
-    fname = os.path.join(DESTDIR, "downloads", "git-annex-installer.exe")
-    return fname
+    win_git_annex_url = ("https://downloads.kitenet.net/git-annex/windows/"
+                         "current/git-annex-installer.exe")
+    return download(win_git_annex_url)
 
 
 def package_linux_plain(binfile):
@@ -362,6 +361,8 @@ def package_mac_bundle(binfile, annex_tar):
     For each macOS binary make a zip that includes the annex.app with the gin
     binary in its path.
     """
+    if not annex_tar:
+        return None
     with TemporaryDirectory(suffix="gin-macos") as tmpdir:
         # extract macOS git-annex tar into pkgroot
         cmd = ["tar", "-xjf", annex_tar, "-C", tmpdir]
@@ -446,6 +447,7 @@ def winbundle(binfile, git_pkg, annex_pkg):
         shutil.copy(binfile, bindir)
         shutil.copy("README.md", pkgroot)
         shutil.copy(os.path.join("scripts", "gin-shell.bat"), pkgroot)
+        shutil.copy(os.path.join("scripts", "set-global.bat"), pkgroot)
 
         gitdir = os.path.join(pkgroot, "git")
         os.makedirs(gitdir)

scripts/set-global.bat

@@ -0,0 +1,16 @@
+:: GIN client global setup for Windows
+:: 
+:: This file should be part of the gin client Windows bundle. The purpose of
+:: the file is to permanently change the user path environment to be able to
+:: run GIN commands from the command line (cmd and PowerShell).
+
+echo off
+
+set curdir=%~dp0
+
+set ginbinpath=%curdir%\bin
+set gitpaths=%curdir%\git\usr\bin;%curdir%\git\bin
+echo Appending "%ginbinpath%;%gitpaths%" to path
+echo %path%|find /I "%curdir%">nul || setx path "%path%;%ginbinpath%;%gitpaths%"
+echo GIN CLI is ready
+pause

version

@@ -1 +1 @@
-version=1.10
+version=1.11dev