From dc12ab157ce8393bf48e9a051fb8694e98672a30 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Wed, 4 Jan 2023 23:42:06 +0000
Subject: [PATCH] add --version, rearrange, and overhaul install

---
 dotool.go  | 105 +++++++++++++++++++++++++++++------------------------
 install.sh |   9 ++++-
 2 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/dotool.go b/dotool.go
index b8141e4..7073c3c 100644
--- a/dotool.go
+++ b/dotool.go
@@ -4,8 +4,8 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/bendahl/uinput"
 	"git.sr.ht/~geb/opt"
+	"github.com/bendahl/uinput"
 	"math"
 	"os"
 	"strconv"
@@ -14,15 +14,62 @@ import (
 	"unicode"
 )
 
-func fatal(v ...interface{}) {
+var Version string
+
+func usage() {
+	fmt.Fprintln(os.Stderr, `dotool reads commands from stdin and simulates keyboard and pointer events.
+
+The commands are:
+	key CHORD...
+	keydown CHORD...
+	keyup CHORD...
+	type TEXT
+	click left/middle/right
+	buttondown left/middle/right
+	buttonup left/middle/right
+	scroll NUMBER  (where NUMBER is the amount down/up if positive/negative)
+	mouseto X Y  (where X and Y are percentages between 0.0 and 1.0)
+	mousemove X Y  (where X and Y are the number of pixels to move)
+	keydelay MILLISECONDS  (default: 2)
+	keyhold MILLISECONDS  (default: 8)
+	typedelay MILLISECONDS  (default: 2)
+	typehold MILLISECONDS  (default: 8)
+
+Example: echo "key h i shift+1" | dotool
+
+dotool is installed with a udev rule to allow users in group input to run
+it without root permissions. You can make it effective without rebooting by
+running: sudo udevadm trigger
+
+The keys are those used by Linux, but can also be specified using X11 names
+prefixed with x: like x:exclam, as well as their Linux keycode like k:30.
+They are case insensitive, except uppercase character keys also simulate shift.
+
+The modifiers are: super, ctrl, alt and shift.
+
+The daemon and client, dotoold and dotoolc, can used to keep a persistent
+virtual device for a quicker initial response.
+
+--list-keys
+	Print the supported Linux keys and their keycodes.
+
+--list-x-keys
+	Print the supported X11 keys and their Linux keycodes.
+
+--version
+	Print the version and exit.
+`)
+}
+
+func fatal(a ...any) {
 	fmt.Fprint(os.Stderr, "dotool: ")
-	fmt.Fprintln(os.Stderr, v...)
+	fmt.Fprintln(os.Stderr, a...)
 	os.Exit(1)
 }
 
-func warn(v ...interface{}) {
+func warn(a ...any) {
 	fmt.Fprint(os.Stderr, "dotool WARNING: ")
-	fmt.Fprintln(os.Stderr, v...)
+	fmt.Fprintln(os.Stderr, a...)
 }
 
 func log(err error) {
@@ -121,48 +168,6 @@ func (c *Chord) KeyUp(kb uinput.Keyboard) {
 }
 
 
-func usage() {
-	fmt.Fprintln(os.Stderr, `dotool reads commands from stdin and simulates keyboard and pointer events.
-
-The commands are:
-	key CHORD...
-	keydown CHORD...
-	keyup CHORD...
-	type TEXT
-	click left/middle/right
-	buttondown left/middle/right
-	buttonup left/middle/right
-	scroll NUMBER  (where NUMBER is the amount down/up if positive/negative)
-	mouseto X Y  (where X and Y are percentages between 0.0 and 1.0)
-	mousemove X Y  (where X and Y are the number of pixels to move)
-	keydelay MILLISECONDS  (default: 2)
-	keyhold MILLISECONDS  (default: 8)
-	typedelay MILLISECONDS  (default: 2)
-	typehold MILLISECONDS  (default: 8)
-
-Example: echo "key h i shift+1" | dotool
-
-dotool is installed with a udev rule to allow users in group input to run
-it without root permissions. You can make it effective without rebooting by
-running: sudo udevadm trigger
-
-The keys are those used by Linux, but can also be specified using X11 names
-prefixed with x: like x:exclam, as well as their Linux keycode like k:30.
-They are case insensitive, except uppercase character keys also simulate shift.
-
-The modifiers are: super, ctrl, alt and shift.
-
-The daemon and client, dotoold and dotoolc, can used to keep a persistent
-virtual device for a quicker initial response.
-
---list-keys
-	Print the supported Linux keys and their keycodes.
-
---list-x-keys
-	Print the supported X11 keys and their Linux keycodes.
-`)
-}
-
 func cutCmd(s, cmd string) (string, bool) {
 	if strings.HasPrefix(s, cmd + " ") || strings.HasPrefix(s, cmd + "\t") {
 		return s[len(cmd)+1:], true
@@ -217,6 +222,12 @@ func main() {
 			panic("unreachable")
 		})
 
+		optset.FlagFunc("version", func() error {
+			fmt.Println(Version)
+			os.Exit(0)
+			panic("unreachable")
+		})
+
 		err := optset.Parse(true, os.Args[1:])
 		if err != nil {
 			fatal(err.Error())
diff --git a/install.sh b/install.sh
index 74620e4..4fd60c1 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
-go build && cp -v dotool dotoolc dotoold /usr/local/bin || exit
-mkdir -p /etc/udev/rules.d && cp -v 80-dotool.rules /etc/udev/rules.d || exit
+# ./install.sh [DESTDIR] [BINDIR]
+version="$(git describe --long --abbrev=12 --tags --dirty 2>/dev/null || echo 1.0)"
+go build -ldflags "-X main.Version=$version" || exit
+mkdir -p "$1/${2:-usr/local/bin}" || exit
+cp -v dotool dotoolc dotoold "$1/${2:-usr/local/bin}" || exit
+mkdir -p "$1/etc/udev/rules.d" || exit
+cp -v 80-dotool.rules "$1/etc/udev/rules.d" || exit
 udevadm trigger