Skip to content

Commit

Permalink
examples-* target user-name check fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mezantrop committed Dec 11, 2023
1 parent a6a5321 commit 67dfdc8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

* 2023.12.10 Current
* 2023.12.11 Current
* `Makefile`: `examples-*` target user-name check fix
* `ts-warp.sh.in`, `ts-warp_autofw.sh.in`: On Linux try Iptables firts, then Nftables; fix execution.
* `socks.c`: Typo fix
* `gui-warp.py`, `gui-warp.app`: Links to releases; better PID-file checking
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ts-warp_autofw.sh:
sed 's|tswarp_prefix=.*|tswarp_prefix="$(PREFIX)"|' ts-warp_autofw.sh.in > ts-warp_autofw.sh

examples-general:
@[ $(USER) == "root" ] && { \
@[ $(USER) = "root" ] && { \
echo "WARNING: Building as root: setting the default user $(RUNUSER) in configuration. Check and correct!"; \
sed "s|%USER%|$(RUNUSER)|" ./examples/ts-warp_general_iptables.sh.in > ./examples/ts-warp_iptables.sh; \
sed "s|%USER%|$(RUNUSER)|" ./examples/ts-warp_general_nftables.sh.in > ./examples/ts-warp_nftables.sh; \
Expand All @@ -68,7 +68,7 @@ examples-general:
}

examples-special:
@[ $(USER) == "root" ] && { \
@[ $(USER) = "root" ] && { \
echo "WARNING: Building as root: setting the default user $(RUNUSER) in configuration. Check and correct!"; \
sed "s|%USER%|$(RUNUSER)|" ./examples/ts-warp_special_iptables.sh.in > ./examples/ts-warp_iptables.sh; \
sed "s|%USER%|$(RUNUSER)|" ./examples/ts-warp_special_nftables.sh.in > ./examples/ts-warp_nftables.sh; \
Expand Down

0 comments on commit 67dfdc8

Please sign in to comment.