1.9.3

Add scoop install instructions to readme.md (#30)

LICENSE.wslbridge

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2016 Ryan Prichard
-Copyright (c) 2018 Google LLC
+Copyright (c) 2017-2018 Google LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

README.md

@@ -52,6 +52,15 @@ invoke one of
 * `choco install wsltty`
 * `choco upgrade wsltty`
 
+#### Scoop ####
+
+If you use the [Scoop package manager](https://scoop.sh/), 
+* `scoop bucket add extras`
+
+then, invoke one of
+* `scoop install wsltty`
+* `scoop update wsltty`
+
 #### Windows Appx package ####
 
 A Windows Appx package and certificate is available in the [wsltty.appx](https://github.com/mintty/wsltty.appx/) repository.

VERSION

@@ -1 +1 @@
-1.9.0
+1.9.3

config-distros.sh

@@ -1,14 +1,17 @@
 #! /bin/sh
 
-PATH=/bin:$PATH
+installdir=${installdir:-'%LOCALAPPDATA%\wsltty'}
+configdir=${configdir:-'%APPDATA%\wsltty'}
+
+PATH=/bin:"$PATH"
 
 contextmenu=false
 remove=false
 alldistros=true
 config=true
 
-case "`basename $0`" in
+case "/$0" in
-wsl*)
+*/wsl*)
   config=false;;
 esac
 
@@ -98,8 +101,6 @@ echo %target% -i "%icon%" %minttyargs% %bridgeargs%>> %1.bat
 /EOB
 fi
 
-PATH=/bin:$PATH
-
 lxss="/HKEY_CURRENT_USER/Software/Microsoft/Windows/CurrentVersion/Lxss"
 schema="/HKEY_CURRENT_USER/Software/Classes/Local Settings/Software/Microsoft/Windows/CurrentVersion/AppModel/SystemAppData"
 
@@ -132,7 +133,7 @@ do
     	instdir=`regtool get "$schema/$package/Schemas/PackageFullName"`
     	if [ -r "$ProgramW6432/WindowsApps/$instdir/images/icon.ico" ]
     	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/images/icon.ico"
-    	else	icon="%LOCALAPPDATA%/wsltty/wsl.ico"
+    	else	icon="$installdir"'\wsl.ico'
     	fi
     	root="$basepath/rootfs"
     else
@@ -140,8 +141,8 @@ do
     	root="$basepath"
     fi
 
-    minttyargs='--wsl --rootfs="'"$root"'" --configdir="%APPDATA%\wsltty" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
+    minttyargs='--wsl --rootfs="'"$root"'" --configdir="'"$configdir"'" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
-    minttyargs='--WSL="'"$distro"'" --configdir="%APPDATA%\wsltty"'
+    minttyargs='--WSL="'"$distro"'" --configdir="'"$configdir"'"'
     #if [ -z "$launch" ]
     #then	bridgeargs='-t /bin/bash'
     #else	bridgeargs='-l "'"$launch"'" -t /bin/bash'
@@ -153,8 +154,8 @@ do
   "")	# WSL default installation
     distro=
     name=WSL
-    icon="%LOCALAPPDATA%/wsltty/wsl.ico"
+    icon="$installdir"'\wsl.ico'
-    minttyargs='--WSL= --configdir="%APPDATA%\wsltty"'
+    minttyargs='--WSL= --configdir="'"$configdir"'"'
     bridgeargs='-t'
 
     ok=true;;
@@ -165,7 +166,7 @@ do
   echoc "- (launcher $launcher)"
   echoc "- icon $icon"
   echoc "- root $root"
-  target='%LOCALAPPDATA%\wsltty\bin\mintty.exe'
+  target="$installdir"'\bin\mintty.exe'
   bridgeargs=" "
 
   if $ok && $config
@@ -203,8 +204,8 @@ do
 
         # launch script in . -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name"
-        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\wsltty\\$name.bat"
+        cmd /C copy "$name.bat" "$installdir"
-        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
+        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
 
         # prepare versions to target WSL home directory
         #bridgeargs="-C~ $bridgeargs"
@@ -221,8 +222,8 @@ do
 
         # launch script in ~ -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name~"
-        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\wsltty\\$name~.bat"
+        cmd /C copy "$name~.bat" "$installdir"
-        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
+        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
       fi
 
     fi

makefile

@@ -8,11 +8,14 @@
 
 
 # wsltty release
-ver=1.9.0
+ver=1.9.3
+
+# wsltty appx release
+verx=0.9.3
 
 ##############################
 # mintty release version
-minttyver=2.9.0
+minttyver=2.9.3
 
 # or mintty branch or commit version
 #minttyver=master
@@ -41,6 +44,9 @@ wslbridge-commit=29df86d87135caec8424c08f031ce121a3a39ae1
 # after 0.2.4, merged wslpath branch:
 wslbridge-commit=06fb7acba28d7f37611f3911685af214739895a0
 
+# after 0.2.4, with --backend option:
+wslbridge-commit=47b41bec6c32da58ab01de9345087b1a4fd836e3
+
 #############################################################################
 # default target
 
@@ -110,7 +116,7 @@ wslbridge-frontend:	wslbridge-source
 	cp wslbridge-$(wslbridge-commit)/out/wslbridge.exe bin/
 
 wslbridge-backend:	wslbridge-source
-	cd wslbridge-$(wslbridge-commit)/backend; wslbridge make
+	cd wslbridge-$(wslbridge-commit)/backend; if uname -m | grep x86_64; then cmd /C wsl make; else wslbridge make; fi
 	mkdir -p bin
 	cp wslbridge-$(wslbridge-commit)/out/wslbridge-backend bin/
 
@@ -119,7 +125,9 @@ mintty-get:
 	unzip -o mintty-$(minttyver).zip
 
 wslbuild=LDFLAGS="-static -static-libgcc -s"
+appxbuild=$(wslbuild) CCOPT=-DWSLTTY_APPX
 wslversion=VERSION_SUFFIX="– wsltty $(ver)" WSLTTY_VERSION="$(ver)"
+appxversion=VERSION_SUFFIX="– wsltty appx $(verx)" WSLTTY_VERSION="$(verx)"
 
 mintty-build:
 	# ensure rebuild of version-specific check and message
@@ -129,6 +137,14 @@ mintty-build:
 	mkdir -p bin
 	cp mintty-$(minttyver)/bin/mintty.exe bin/
 
+mintty-build-appx:
+	# ensure rebuild of version-specific check and message
+	rm -f mintty-$(minttyver)/bin/*/windialog.o
+	# build mintty
+	cd mintty-$(minttyver)/src; make $(appxbuild) $(appxversion)
+	mkdir -p bin
+	cp mintty-$(minttyver)/bin/mintty.exe bin/
+
 mintty-pkg:
 	cp mintty-$(minttyver)/LICENSE LICENSE.mintty
 	cd mintty-$(minttyver)/lang; zoo a lang *.po; mv lang.zoo ../../
@@ -205,7 +221,7 @@ wsltty:	wslbridge cygwin mintty-build mintty-pkg
 pkg:	wslbridge cygwin mintty-get mintty-build mintty-pkg cab
 
 # appx package contents target:
-wsltty-appx:	wslbridge appx-bin mintty-get mintty-build mintty-appx
+wsltty-appx:	wslbridge appx-bin mintty-get mintty-build-appx mintty-appx
 
 # appx package target:
 appx:	wsltty-appx