diff options
| -rw-r--r-- | config-5.1.lua | 5 | ||||
| -rw-r--r-- | lua4win.wxs | 2 | ||||
| -rwxr-xr-x | test | 40 |
3 files changed, 9 insertions, 38 deletions
diff --git a/config-5.1.lua b/config-5.1.lua index a24aa83..713c6a9 100644 --- a/config-5.1.lua +++ b/config-5.1.lua | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | 1 | ||
| 2 | rocks_servers = { | 2 | rocks_servers = { |
| 3 | { | 3 | { |
| 4 | "http://lua4.win", | 4 | "http://rocks.lua4.win", |
| 5 | }, | ||
| 6 | { | ||
| 5 | "https://luarocks.org", | 7 | "https://luarocks.org", |
| 6 | "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/", | 8 | "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/", |
| 7 | "https://loadk.com/luarocks/" | 9 | "https://loadk.com/luarocks/" |
| @@ -17,3 +19,4 @@ rocks_trees = { | |||
| 17 | root = home .. "\\luarocks" | 19 | root = home .. "\\luarocks" |
| 18 | } | 20 | } |
| 19 | } | 21 | } |
| 22 | arch="mingw32-x86_64" | ||
diff --git a/lua4win.wxs b/lua4win.wxs index d96c922..a6663c6 100644 --- a/lua4win.wxs +++ b/lua4win.wxs | |||
| @@ -43,6 +43,8 @@ | |||
| 43 | </Directory> | 43 | </Directory> |
| 44 | <Component Id="EnvironmentPath" Guid="Lua4Win.PATH"> | 44 | <Component Id="EnvironmentPath" Guid="Lua4Win.PATH"> |
| 45 | <Environment Id="Path" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]"/> | 45 | <Environment Id="Path" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]"/> |
| 46 | <Environment Id="Path2" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]luarocks\\bin"/> | ||
| 47 | <Environment Id="Path3" Name="PATH" Action="set" System="yes" Part="last" Value="[AppDataFolder]luarocks\\bin"/> | ||
| 46 | </Component> | 48 | </Component> |
| 47 | <Component Id="SysConfigPath" Guid="Lua4Win.SYSCONFDIR"> | 49 | <Component Id="SysConfigPath" Guid="Lua4Win.SYSCONFDIR"> |
| 48 | <Environment Id="Sysconfdir" Name="LUAROCKS_SYSCONFDIR" Action="set" System="yes" Part="last" Value="[INSTALLDIR]config"/> | 50 | <Environment Id="Sysconfdir" Name="LUAROCKS_SYSCONFDIR" Action="set" System="yes" Part="last" Value="[INSTALLDIR]config"/> |
| @@ -8,43 +8,6 @@ DISPLAY=:99 WINEDLLOVERRIDES="mscoree,mshtml=" wineboot -i | |||
| 8 | DISPLAY=:99 msiexec /i lua4win.msi & | 8 | DISPLAY=:99 msiexec /i lua4win.msi & |
| 9 | WIN="Lua4Win Installer 1.0 Setup" | 9 | WIN="Lua4Win Installer 1.0 Setup" |
| 10 | DISPLAY=:99 xdotool sleep 3 | 10 | DISPLAY=:99 xdotool sleep 3 |
| 11 | # win=$(DISPLAY=:99 xdotool search --sync --name "Installer") | ||
| 12 | # # Click Next | ||
| 13 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/1.png | ||
| 14 | # DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 346 334 | ||
| 15 | # DISPLAY=:99 xdotool sleep 1 | ||
| 16 | # DISPLAY=:99 xdotool click 1 | ||
| 17 | # DISPLAY=:99 xdotool sleep 1 | ||
| 18 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/2.png | ||
| 19 | # # Click agree to liscense | ||
| 20 | # DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 34 286 | ||
| 21 | # DISPLAY=:99 xdotool sleep 1 | ||
| 22 | # DISPLAY=:99 xdotool click 1 | ||
| 23 | # DISPLAY=:99 xdotool sleep 1 | ||
| 24 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/3.png | ||
| 25 | # # Click next | ||
| 26 | # DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 350 337 | ||
| 27 | # DISPLAY=:99 xdotool sleep 1 | ||
| 28 | # DISPLAY=:99 xdotool click 1 | ||
| 29 | # DISPLAY=:99 xdotool sleep 1 | ||
| 30 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/4.png | ||
| 31 | # # Click next (Accept default install location) | ||
| 32 | # DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 350 337 | ||
| 33 | # DISPLAY=:99 xdotool sleep 1 | ||
| 34 | # DISPLAY=:99 xdotool click 1 | ||
| 35 | # DISPLAY=:99 xdotool sleep 1 | ||
| 36 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/5.png | ||
| 37 | # # Click install | ||
| 38 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/6.png | ||
| 39 | # DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 335 335 | ||
| 40 | # DISPLAY=:99 xdotool sleep 1 | ||
| 41 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/7.png | ||
| 42 | # DISPLAY=:99 xdotool click 1 | ||
| 43 | # DISPLAY=:99 xdotool sleep 1 | ||
| 44 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/8.png | ||
| 45 | # DISPLAY=:99 xdotool sleep 5 | ||
| 46 | # DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/9.png | ||
| 47 | # tar -czf images.tar.gz *.png | ||
| 48 | 11 | ||
| 49 | # Try to turn off underlined hotkeys | 12 | # Try to turn off underlined hotkeys |
| 50 | wine reg add "HKCU\\Control Panel\\Accessibility\\Keyboard Preference" /v "On" /d "0" /f | 13 | wine reg add "HKCU\\Control Panel\\Accessibility\\Keyboard Preference" /v "On" /d "0" /f |
| @@ -79,3 +42,6 @@ test -e "$INSTALLDIR/luajit.exe" | |||
| 79 | test -e "$INSTALLDIR/luarocks.exe" | 42 | test -e "$INSTALLDIR/luarocks.exe" |
| 80 | wine "$INSTALLDIR/luarocks.exe" --help | 43 | wine "$INSTALLDIR/luarocks.exe" --help |
| 81 | wine "$INSTALLDIR/luarocks.exe" config | 44 | wine "$INSTALLDIR/luarocks.exe" config |
| 45 | |||
| 46 | # Try installing something with it | ||
| 47 | wine "luarocks install lpeg" | ||
