fix local name WEBI_CSV

This commit is contained in:
AJ ONeal
2020-05-03 08:46:49 +00:00
parent d755022695
commit a418f075a7
3 changed files with 13 additions and 13 deletions
+4 -4
View File
@@ -51,15 +51,15 @@ WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-go.XXXXXXXX)"}
# but each script should be testable in its own right
if [ -z "${WEBI_PKG_URL:-}" ]; then
release_tab="${WEBI_HOST}/api/releases/go@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1"
release_tab="${WEBI_HOST}/api/releases/golang@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1"
WEBI_CSV=$(curl -fsSL "$release_tab" -H "User-Agent: $(uname -a)")
WEBI_CHANNEL=$(echo $WEBI_TAB | cut -d ',' -f 3)
WEBI_CHANNEL=$(echo $WEBI_CSV | cut -d ',' -f 3)
if [ "error" == "$WEBI_CHANNEL" ]; then
echo "could not find release for go v${WEBI_VERSION}"
exit 1
fi
WEBI_VERSION=$(echo $WEBI_TAB | cut -d ',' -f 1)
WEBI_PKG_URL=$(echo $WEBI_TAB | cut -d ',' -f 9)
WEBI_VERSION=$(echo $WEBI_CSV | cut -d ',' -f 1)
WEBI_PKG_URL=$(echo $WEBI_CSV | cut -d ',' -f 9)
WEBI_PKG_FILE="$WEBI_TMP/$(echo $WEBI_PKG_URL | sed s:.*/::)"
fi
+6 -6
View File
@@ -67,22 +67,22 @@ http_get() {
fi
}
WEBI_TAB=$(curl -fsSL "https://webinstall.dev/api/releases/node@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1" -H "User-Agent: $(uname -a)")
NODEJS_VER=$(echo $WEBI_TAB | cut -d ',' -f 1)
NODEJS_REMOTE=$(echo $WEBI_TAB | cut -d ',' -f 9)
WEBI_CSV=$(curl -fsSL "https://webinstall.dev/api/releases/node@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1" -H "User-Agent: $(uname -a)")
NODEJS_VER=$(echo $WEBI_CSV | cut -d ',' -f 1)
NODEJS_REMOTE=$(echo $WEBI_CSV | cut -d ',' -f 9)
NODEJS_LOCAL="$my_tmp/$(echo $NODEJS_REMOTE | sed s:.*/::)"
NODE_OS="$(echo $WEBI_TAB | cut -d ',' -f 5)"
NODE_OS="$(echo $WEBI_CSV | cut -d ',' -f 5)"
#########
# BEGIN #
#########
# WEBI_ARCH uses only slightly different names from NODE_ARCH
NODE_OS="$(echo $WEBI_TAB | cut -d ',' -f 5)"
NODE_OS="$(echo $WEBI_CSV | cut -d ',' -f 5)"
if [ "macos" == "$NODE_OS" ]; then
NODE_OS="darwin"
fi
NODE_ARCH="$(echo $WEBI_TAB | cut -d ',' -f 6)"
NODE_ARCH="$(echo $WEBI_CSV | cut -d ',' -f 6)"
if [ "amd64" == "$NODE_ARCH" ]; then
NODE_ARCH="x64"
fi
+3 -3
View File
@@ -37,13 +37,13 @@ WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-ripgrep.XXXXXXXX)"}
if [ -z "${WEBI_PKG_URL:-}" ]; then
release_tab="${WEBI_HOST}/api/releases/ripgrep@${WEBI_VERSION:-}.csv?os=$(uname -s)&arch=$(uname -m)&ext=tar&limit=1"
WEBI_CSV=$(curl -fsSL "$release_tab" -H "User-Agent: $(uname -a)")
WEBI_CHANNEL=$(echo $WEBI_TAB | cut -d ',' -f 3)
WEBI_CHANNEL=$(echo $WEBI_CSV | cut -d ',' -f 3)
if [ "error" == "$WEBI_CHANNEL" ]; then
echo "could not find release for ripgrep v${WEBI_VERSION}"
exit 1
fi
WEBI_VERSION=$(echo $WEBI_TAB | cut -d ',' -f 1)
WEBI_PKG_URL=$(echo $WEBI_TAB | cut -d ',' -f 9)
WEBI_VERSION=$(echo $WEBI_CSV | cut -d ',' -f 1)
WEBI_PKG_URL=$(echo $WEBI_CSV | cut -d ',' -f 9)
WEBI_PKG_FILE="$WEBI_TMP/$(echo $WEBI_PKG_URL | sed s:.*/::)"
fi