Skip to content

Fix --hostname switch #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiaranG wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix --hostname switch #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions setup-initramfs-tailscale
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,31 @@ cleanup() {
}
trap "cleanup" EXIT

# Scan arguments looking for --hostname=VALUE
FOUND_HOSTNAME_IN_ARGS=no
for arg in "$@"; do
if [[ $arg =~ ^(-h|--help|help)$ ]]; then
usage
exit 0
fi
if [[ $arg =~ ^--hostname= ]]; then
TS_HOSTNAME=${arg#*=}
TS_HOSTNAME=${TS_HOSTNAME//[\"\']}
FOUND_HOSTNAME_IN_ARGS=yes
fi
# Scan arguments looking for --hostname
NEW_ARGS=()
while [[ $# -gt 0 ]]; do
case "$1" in
-h|--help|help)
usage
exit 0
;;
--hostname=*)
TS_HOSTNAME="${1#*=}"
TS_HOSTNAME=${TS_HOSTNAME//[\"\']}
shift
;;
--hostname)
TS_HOSTNAME="$2"
TS_HOSTNAME=${TS_HOSTNAME//[\"\']}
shift 2
;;
*)
NEW_ARGS+=("$1")
shift
;;
esac
done
[[ $FOUND_HOSTNAME_IN_ARGS == yes ]] || set -- --hostname="$TS_HOSTNAME" "$@"
set -- --hostname="$TS_HOSTNAME" "${NEW_ARGS[@]}"

SETUPDIR="$(mktemp -d)"
socket="${SETUPDIR}/tailscaled.sock"
Expand Down