revise installation; change config location, flexible install target

install.bat

@@ -1,11 +1,14 @@
 @echo off
 
-rem If you change the installation directory,
-rem it also needs to be adapted in
-rem - the Shortcut links *.lnk
-rem - the cmd invocation scripts wsl*.bat
-
+set refinstalldir=%%LOCALAPPDATA%%\wsltty
 set installdir=%LOCALAPPDATA%\wsltty
+set refconfigdir=%%APPDATA%%\wsltty
+set configdir=%APPDATA%\wsltty
+set oldroot=%installdir%
+set oldhomedir=%installdir%\home\%USERNAME%
+set oldconfigdir=%oldhomedir%\.config\mintty
+if not "%1" == "" set refinstalldir=%1 && set installdir=%1
+if not "%2" == "" set refconfigdir=%2 && set configdir=%2
 
 
 :deploy
@@ -13,18 +16,20 @@ set installdir=%LOCALAPPDATA%\wsltty
 mkdir "%installdir%"
 copy LICENSE.mintty "%installdir%"
 copy LICENSE.wslbridge "%installdir%"
-copy uninstall.bat "%installdir%"
 
-copy wsl.bat "%installdir%"
-copy wsl~.bat "%installdir%"
-copy wsl-l.bat "%installdir%"
-copy "config-context-menu.bat" "%installdir%"
+echo @echo off> setdirs.bat
+echo set refinstalldir=%refinstalldir%>> setdirs.bat
+echo set installdir=%installdir%>> setdirs.bat
+echo set refconfigdir=%refconfigdir%>> setdirs.bat
+echo set configdir=%configdir%>> setdirs.bat
+copy setdirs.bat + wsl.bat "%installdir%\wsl.bat"
+copy setdirs.bat + wsl~.bat "%installdir%\wsl~.bat"
+copy setdirs.bat + wsl-l.bat "%installdir%\wsl-l.bat"
+copy setdirs.bat + uninstall.bat "%installdir%\uninstall.bat"
+copy setdirs.bat + config-context-menu.bat "%installdir%\config-context-menu.bat"
+
 copy "add to context menu.lnk" "%installdir%"
 copy "remove from context menu.lnk" "%installdir%"
-rem does not work without admin rights:
-rem copy wsl.bat "%SYSTEMROOT%\System32"
-rem copy wsl~.bat "%SYSTEMROOT%\System32"
-rem copy wsl-l.bat "%SYSTEMROOT%\System32"
 
 mkdir "%installdir%\bin"
 copy cygwin1.dll "%installdir%\bin"
@@ -35,26 +40,28 @@ copy zoo.exe "%installdir%\bin"
 copy wslbridge.exe "%installdir%\bin"
 copy wslbridge-backend "%installdir%\bin"
 
-rem create "home directory" to enable storage of config file
-mkdir "%installdir%\home
-mkdir "%installdir%\home\%USERNAME%"
-
-rem create "config directory" and copy config archive
-mkdir "%installdir%\home\%USERNAME%\.config"
-mkdir "%installdir%\home\%USERNAME%\.config\mintty"
-mkdir "%installdir%\home\%USERNAME%\.config\mintty\lang"
-copy po.zoo "%installdir%\home\%USERNAME%\.config\mintty\lang"
-
-rem create "temp directory" for version checking
-mkdir "%installdir%\tmp
+rem create system config directory and copy config archive
+mkdir "%installdir%\usr\share\mintty\lang"
+copy po.zoo "%installdir%\usr\share\mintty\lang"
 
 
 :shortcuts
 
+rem generate shortcuts
+
+set icon=%%LOCALAPPDATA%%\lxss\bash.ico
+set target=%refinstalldir%\bin\mintty.exe
+set minttyargs=--wsl --configdir="%refconfigdir%" -o Locale=C -o Charset=UTF-8 /bin/wslbridge 
+set bridgeargs=-t /bin/bash
+cscript mkshortcut.vbs "/name:WSL Bash %% in Mintty"
+set bridgeargs=-C~ -t /bin/bash
+cscript mkshortcut.vbs "/name:WSL Bash ~ in Mintty"
+set bridgeargs=-t /bin/bash -l
+cscript mkshortcut.vbs "/name:WSL Bash -l in Mintty"
+
 rem create Start Menu Folder
 set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
 mkdir "%smf%"
-echo on
 copy "wsltty home & help.url" "%smf%"
 copy "WSL Bash %% in Mintty.lnk" "%smf%"
 copy "WSL Bash ~ in Mintty.lnk" "%smf%"
@@ -68,11 +75,35 @@ copy "WSL Bash %% in Mintty.lnk" "%USERPROFILE%\Desktop"
 copy "WSL Bash ~ in Mintty.lnk" "%USERPROFILE%\Desktop"
 
 
-:config
+:sysconfig
 
-rem unpack config files
-cd /D "%installdir%\home\%USERNAME%\.config\mintty\lang"
-"%installdir%\bin\zoo" x po
+rem unpack config files in system config directory
+cd /D "%installdir%\usr\share\mintty\lang"
+"%installdir%\bin\zoo" xO po
+
+
+:migrate configuration
+
+rem migrate old config resource files to new config dir
+if exist "%configdir%" goto configfile
+if not exist "%oldconfigdir%" goto configfile
+if exist "%oldhomedir%\.minttyrc" copy "%oldhomedir%\.minttyrc" "%oldconfigdir%\config" && del "%oldhomedir%\.minttyrc"
+xcopy /E /I /Y "%oldconfigdir%" "%configdir%" && rmdir /S /Q "%oldconfigdir%"
+rmdir "%oldhomedir%\.config"
+:configfile
+if exist "%configdir%\config" goto deloldhome
+if exist "%oldhomedir%\.minttyrc" copy "%oldhomedir%\.minttyrc" "%configdir%\config" && del "%oldhomedir%\.minttyrc"
+:deloldhome
+rmdir "%oldhomedir%"
+rmdir "%oldroot%\home"
+
+
+:userconfig
+
+rem create user config directory and subfolders
+mkdir "%configdir%\lang"
+mkdir "%configdir%\sounds"
+mkdir "%configdir%\themes"
 
 
 :end