Skip to content

Commit bd1f8a0

Browse files
committed
gui-warp.app: More friendly ts-warp.sh for CLI execution on MacOS
1 parent 3ab2602 commit bd1f8a0

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# CHANGELOG
22

3-
* **2025.06.05 Current - ts-warp-1.5.8, gui-warp-1.0.27 (gui-warp-v1.0.34-mac), ns-warp-1.0.7**
3+
* **2025.07.18 Current**
4+
* `gui-warp.app`: More friendly `ts-warp.sh` for CLI execution on `MacOS`
45
* `ts-warp.c, pidlist.c`: better `PID`-list management
56
* `inifile.c`: suppress negative name lookup messages
67
* `gui-warp.py`: INI-tab Text-field resizing corrected

gui/ports/macOS/gui-warp.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
# -------------------------------------------------------------------------------------------------------------------- #
44

55
[GUI-WARP]
6-
prefix = ~/ts-warp
6+
prefix = ~/ts-warp # !Do not change me!
77

88
# All paths below are relative to the upper prefix variable
9-
# runcmd = ./ts-warp.sh # Use the App bundled one by default
9+
# runcmd = ./ts-warp.sh # Use the App bundled one by default
1010
inifile = /etc/ts-warp.ini
11-
# fwfile = /etc/ts-warp_pf.conf # This should be autoconfigured
11+
# fwfile = /etc/ts-warp_pf.conf # This should be autoconfigured
1212
logfile = /var/log/ts-warp.log
1313
pidfile = /var/run/ts-warp.pid
1414
actfile = /var/spool/ts-warp/ts-warp.act

gui/ports/macOS/ts-warp.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
#
4141

4242
# -- CONFIGURATION VARIABLES ------------------------------------------------- #
43-
tswarp_prefix=$2 # Crack for gui-warp.app
43+
[ -z "$2" -a "$USER" = "root" ] && _usage # The USERNAME and prefix...
44+
tswarp_prefix=${2-"/Users/$USER/ts-warp"} # ...workaround for gui-warp.app
45+
4446
SCRIPTPATH=$(dirname $(readlink -f "$0"))
4547
tswarp_inifile="$tswarp_prefix/etc/ts-warp.ini"
4648
tswarp_pidfile="$tswarp_prefix/var/run/ts-warp.pid"
@@ -168,7 +170,7 @@ _check_root() {
168170

169171
# ---------------------------------------------------------------------------- #
170172
_usage() {
171-
printf "Usage:\n\tts-warp.sh start|stop|reload|restart "/home/user/ts-warp" [options]\n"
173+
printf "Usage:\n\tts-warp.sh start|stop|reload|restart "/Users/USERNAME/ts-warp" [options]\n"
172174
printf "\tts-warp.sh status\n"
173175
exit 1
174176
}

0 commit comments

Comments
 (0)