Add more paths

Add the luarocks/bin folders to the PATH

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 @@
 
 rocks_servers = {
         {
-                "http://lua4.win",
+                "http://rocks.lua4.win",
+        },
+        {
                 "https://luarocks.org",
                 "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/",
                 "https://loadk.com/luarocks/"
@@ -17,3 +19,4 @@ rocks_trees = {
                 root = home .. "\\luarocks"
         }
 }
+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 @@
                                                 </Directory>
                                                 <Component Id="EnvironmentPath" Guid="Lua4Win.PATH">
                                                         <Environment Id="Path" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]"/>
+                                                        <Environment Id="Path2" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]luarocks\\bin"/>
+                                                        <Environment Id="Path3" Name="PATH" Action="set" System="yes" Part="last" Value="[AppDataFolder]luarocks\\bin"/>
                                                 </Component>
                                                 <Component Id="SysConfigPath" Guid="Lua4Win.SYSCONFDIR">
                                                         <Environment Id="Sysconfdir" Name="LUAROCKS_SYSCONFDIR" Action="set" System="yes" Part="last" Value="[INSTALLDIR]config"/>
diff --git a/test b/test
index 83f1130..48323f9 100755
--- a/test
+++ b/test
@@ -8,43 +8,6 @@ DISPLAY=:99 WINEDLLOVERRIDES="mscoree,mshtml=" wineboot -i
 DISPLAY=:99 msiexec /i lua4win.msi &
 WIN="Lua4Win Installer 1.0 Setup"
 DISPLAY=:99 xdotool sleep 3
-# win=$(DISPLAY=:99 xdotool search --sync --name "Installer")
-# # Click Next
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/1.png
-# DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 346 334
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xdotool click 1
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/2.png
-# # Click agree to liscense
-# DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 34 286
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xdotool click 1
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/3.png
-# # Click next
-# DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 350 337
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xdotool click 1
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/4.png
-# # Click next (Accept default install location)
-# DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 350 337
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xdotool click 1
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/5.png
-# # Click install
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/6.png
-# DISPLAY=:99 xdotool mousemove --window "$(DISPLAY=:99 xdotool search --sync --name "Installer")" --sync 335 335
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/7.png
-# DISPLAY=:99 xdotool click 1
-# DISPLAY=:99 xdotool sleep 1
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/8.png
-# DISPLAY=:99 xdotool sleep 5
-# DISPLAY=:99 xwd -name "$WIN" | magick xwd:- png:/root/9.png
-# tar -czf images.tar.gz *.png
 
 # Try to turn off underlined hotkeys
 wine reg add "HKCU\\Control Panel\\Accessibility\\Keyboard Preference" /v "On" /d "0" /f
@@ -79,3 +42,6 @@ test -e "$INSTALLDIR/luajit.exe"
 test -e "$INSTALLDIR/luarocks.exe"
 wine "$INSTALLDIR/luarocks.exe" --help
 wine "$INSTALLDIR/luarocks.exe" config
+
+# Try installing something with it
+wine "luarocks install lpeg"