1.9.5

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

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.2
+1.9.5

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,14 +8,18 @@
 
 
 # wsltty release
-ver=1.9.0.2
+ver=1.9.5
 
-# wsltty appx release
+# wsltty appx release - must have 4 parts!
-verx=0.9.0.2
+verx=1.9.5.0
+
+# Windows SDK version for appx
+WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack
+WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d`
 
 ##############################
 # mintty release version
-minttyver=2.9.0
+minttyver=2.9.5
 
 # or mintty branch or commit version
 #minttyver=master
@@ -90,6 +94,19 @@ check:
 	# check 64 bit to provide 64-Bit stability support:
 	uname -m | grep x86_64
 
+#############################################################################
+# patch version information for appx package configuration
+
+fix-verx:
+	echo patching $(WINSDKVER) into Launcher config
+	cd Launcher; sed -i~ -e "/<supportedRuntime / s,Version=v[.0-9]*,Version=$(WINSDKVER)," app.config
+	echo patched app.config
+	cd Launcher; sed -i~ -e "/<TargetFrameworkVersion>/ s,v[.0-9]*,$(WINSDKVER)," Launcher.csproj
+	echo patched Launcher.csproj
+	echo patching $(verx) into app config
+	sed -i~ -e '/<Identity / s,Version="[.0-9]*",Version="$(verx)",' AppxManifest.xml
+	echo patched AppxManifest.xml
+
 #############################################################################
 # generation
 
@@ -116,7 +133,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/
 
@@ -125,7 +142,7 @@ mintty-get:
 	unzip -o mintty-$(minttyver).zip
 
 wslbuild=LDFLAGS="-static -static-libgcc -s"
-appxbuild=$(wslbuild) -DWSLTTY_APPX
+appxbuild=$(wslbuild) CCOPT=-DWSLTTY_APPX
 wslversion=VERSION_SUFFIX="– wsltty $(ver)" WSLTTY_VERSION="$(ver)"
 appxversion=VERSION_SUFFIX="– wsltty appx $(verx)" WSLTTY_VERSION="$(verx)"
 
@@ -224,7 +241,7 @@ pkg:	wslbridge cygwin mintty-get mintty-build mintty-pkg cab
 wsltty-appx:	wslbridge appx-bin mintty-get mintty-build-appx mintty-appx
 
 # appx package target:
-appx:	wsltty-appx
+appx:	wsltty-appx fix-verx
 	sh ./build.sh
 
 #############################################################################