TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 22:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/installer.sh: use expr for regex matches.

Browse Source 
=~ doesn't work in posix shell, only in bash, and we don't use bash.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-10-19 19:31:26 -07:00 committed by Dave Anderson
parent 7ce9c7ce84
commit 1b4e007425
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/installer.sh
View File

@ -38,7 +38,7 @@ main() {
PACKAGETYPE="apt" PACKAGETYPE="apt"
# Third-party keyrings became the preferred method of # Third-party keyrings became the preferred method of
# installation in Ubuntu 20.04. # installation in Ubuntu 20.04.
if [ "$VERSION_ID" =~ ^2 ]; then if expr "$VERSION_ID" : "2.*" >/dev/null; then
APT_KEY_TYPE="keyring" APT_KEY_TYPE="keyring"
else else
APT_KEY_TYPE="legacy" APT_KEY_TYPE="legacy"
@ -72,7 +72,7 @@ main() {
OS="$ID" OS="$ID"
VERSION="$VERSION_ID" VERSION="$VERSION_ID"
PACKAGETYPE="dnf" PACKAGETYPE="dnf"
if [ "$VERSION" =~ ^7 ]; then if expr "$VERSION" : "7.*" >/dev/null; then
PACKAGETYPE="yum" PACKAGETYPE="yum"
fi fi
;; ;;