tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/Makefile b/Makefile
2index 8b54a8b..6522293 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -60,7 +60,6 @@ xdotool/libxdo.a: xdotool/.git
6 $(MAKE) -C xdotool libxdo.a
7
8 lib/configured:
9- shards install --frozen
10 ./bin/gi-crystal
11 # TODO: can be fixed in application code?
12 sed -i -E 's/private getter xdo_p/getter xdo_p/' lib/x_do/src/x_do.cr
13@@ -71,7 +70,7 @@ lib/configured:
14 test-appimage: ahk_x11.AppImage
15 ./ahk_x11.AppImage tests.ahk
16 test-dev: bin/ahk_x11
17- ./bin/ahk_x11 tests.ahk
18+ XDG_CACHE_HOME=${TMPDIR} HOME=${TMPDIR} xvfb-run --auto-display openbox --startup "./bin/ahk_x11 tests.ahk"
19
20 clean:
21 rm -rf ahk_x11.AppImage bin/ahk_x11 bin/ahk_x11.dev linuxdeploy-plugin-gtk.sh linuxdeploy-x86_64.AppImage lib
22diff --git a/src/ahk_x11.cr b/src/ahk_x11.cr
23index 16777d8..b4d96e1 100644
24--- a/src/ahk_x11.cr
25+++ b/src/ahk_x11.cr
26@@ -67,14 +67,12 @@ version = {{ read_file("./shard.yml").split("\n")[1][9..] }}
27 lines = Compiler.new.extract.try &.split('\n')
28 is_compiled = !! lines
29 if ! lines
30- # Only needed for installer script, this can't (yet) really be part of ahk code. TODO: rm on exit
31- File.write("/tmp/tmp_ahk_x11_logo.png", logo_blob)
32 if ARGV[0]?
33 if ARGV[0] == "-v" || ARGV[0] == "--version"
34 puts "AHK_X11 version: #{version}\nTargets to partially implement Classic Windows AutoHotkey specification: v1.0.24 (2004). AutoHotkey is a scripting language."
35 ::exit
36 elsif ARGV[0] == "-h" || ARGV[0] == "--help"
37- puts "AHK_X11 is a Linux implementation for AutoHotkey classic version 1.0.24 (2004). Internal version: #{version}. Full up to date documentation can be found at https://phil294.github.io/AHK_X11/.\n\nPossible methods of invocation:\n\nahk_x11.AppImage \"path to script.ahk\"\nahk_x11.AppImage <<< $'MsgBox, 1\\nMsgBox, 2'\nahk_x11.AppImage --repl\nahk_x11.AppImage --windowspy\nahk_x11.AppImage --compile \"path to script.ahk\" \"optional: output executable file path\"\n\nAlternatively, just run the program without arguments to open the graphical installer. Once installed, you should be able to run and/or compile any .ahk file in your file manager by selecting it from the right click context menu."
38+ puts "AHK_X11 is a Linux implementation for AutoHotkey classic version 1.0.24 (2004). Internal version: #{version}. Full up to date documentation can be found at https://phil294.github.io/AHK_X11/.\n\nPossible methods of invocation:\n\nahk_x11 \"path to script.ahk\"\nahk_x11 <<< $'MsgBox, 1\\nMsgBox, 2'\nahk_x11 --repl\nahk_x11 --windowspy\nahk_x11 --compile \"path to script.ahk\" \"optional: output executable file path\"\n\nAlternatively, you should be able to run and/or compile any .ahk file in your file manager by selecting it from the right click context menu."
39 ::exit
40 elsif ARGV[0] == "--repl"
41 lines = ["#Persistent"]
42@@ -101,7 +99,8 @@ if ! lines
43 if stdin
44 lines = stdin.split('\n')
45 else
46- lines = {{ read_file("./src/installer.ahk").split("\n") }}
47+ puts "Use -h for help."
48+ ::exit 1
49 end
50 end
51 end
52@@ -120,4 +119,4 @@ rescue e : Run::RuntimeException
53 build_error e
54 end
55
56-sleep # exiting is completely handled in runner
57\ No newline at end of file
58+sleep # exiting is completely handled in runner