Improve command line launcher

3 files changed, 14 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64f53e3a46eb..8a905514f4f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = osu
 	pkgdesc = A free-to-win rhythm game
 	pkgver = 20210423.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://osu.ppy.sh
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = osu
 	source = osu.xml
 	sha256sums = 58eff9a415b6d8d46fc8b6bd006dbffb81e545fe964c2d11d337b8f1838fb8a9
 	sha256sums = SKIP
-	sha256sums = 327ab47237be712e07e2d35ad16dc5c71e23b91d91af0d63e83efd60d977ec68
+	sha256sums = 5765f6c08e946170806fa89de1a71351b4c48cd8cf61e1779f00ca71c4c7490f
 	sha256sums = 0a2bb920ba3e8ddc9aa6e1bb2321c748b6efb06189294ccdb59fb1977d7a39b5
 	sha256sums = 85a5f5468a22dad75b8e8cfad8bd0754ed5e4ece693a398de0b90ba1934ac4fe
 
diff --git a/PKGBUILD b/PKGBUILD
index 9266cffdedf7..adab2d773d35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname='osu'
 pkgver='20210423.2'
-pkgrel=1
+pkgrel=2
 pkgdesc='A free-to-win rhythm game'
 arch=('i686' 'x86_64')
 url='https://osu.ppy.sh'
@@ -19,7 +19,7 @@ source=("${pkgname}-installer-${pkgver}.exe::https://m1.ppy.sh/r/osu!install.exe
         "${pkgname}.xml")
 sha256sums=('58eff9a415b6d8d46fc8b6bd006dbffb81e545fe964c2d11d337b8f1838fb8a9'
             'SKIP'
-            '327ab47237be712e07e2d35ad16dc5c71e23b91d91af0d63e83efd60d977ec68'
+            '5765f6c08e946170806fa89de1a71351b4c48cd8cf61e1779f00ca71c4c7490f'
             '0a2bb920ba3e8ddc9aa6e1bb2321c748b6efb06189294ccdb59fb1977d7a39b5'
             '85a5f5468a22dad75b8e8cfad8bd0754ed5e4ece693a398de0b90ba1934ac4fe')
 
diff --git a/osu.sh b/osu.sh
index eafa51ac4ae0..5667dd1ea778 100644
--- a/osu.sh
+++ b/osu.sh
@@ -23,7 +23,7 @@ fi
 
 case "$1" in
 	'kill')
-		wineserver -k
+		wineserver -k "$2"
 		;;
 	'winetricks')
 		shift 1
@@ -33,15 +33,16 @@ case "$1" in
 		shift 1
 		wine "$@"
 		;;
-	'')
-		env vblank_mode=0 __GL_SYNC_TO_VBLANK=0 wine "${OSU_STABLE_DATA_DIRECTORY}/osu!.exe" "$@"
-		wineserver -w
+	'-h'|'--help'|'help')
+		echo 'Usage:'
+		printf '%s [command]\t\t\tRun the game (with optional command)\n' "$(basename "$0")"
+		printf '%s kill [n]\t\t\tKill the game (optinally with signal n)\n' "$(basename "$0")"
+		printf '%s wine [command]\t\tExecute Wine command on the Wine prefix (winecfg, regedit, ...)\n' "$(basename "$0")"
+		printf '%s winetricks [command]\t\tExecute Winetricks command on the Wine prefix\n' "$(basename "$0")"
+		printf '%s {-h --help help}\t\tDisplay this help\n' "$(basename "$0")"
 		;;
 	*)
-		echo 'Usage:'
-		printf '%s\t\t\tRun the game\n' "$(basename "$0")"
-		printf '%s kill\t\t\tKill the game\n' "$(basename "$0")"
-		printf '%s wine [command]\tExecute Wine command on the Wine prefix (winecfg, regedit, ...)\n' "$(basename "$0")"
-		printf '%s winetricks [command]\tExecute Winetricks command on the Wine prefix\n' "$(basename "$0")"
+		env vblank_mode=0 __GL_SYNC_TO_VBLANK=0 wine "${OSU_STABLE_DATA_DIRECTORY}/osu!.exe" "$@"
+		wineserver -w
 		;;
 esac