Skip to content

Commit 3edc9f6

Browse files
committed
Replace project-specific variable names in template install script
Variable names made reference to the specific project the script originated from. This is not appropriate now that the installation script is intended to be used for any project. This is a pure refactoring without any functional effect.
1 parent 9bc86df commit 3edc9f6

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

etc/install.sh

+22-22
Original file line numberDiff line numberDiff line change
@@ -126,54 +126,54 @@ downloadFile() {
126126
fi
127127
# arduino-lint_0.4.0-rc1_Linux_64bit.[tar.gz, zip]
128128
if [ "$OS" = "Windows" ]; then
129-
ARDUINO_LINT_DIST="${PROJECT_NAME}_${TAG}_${OS}_${ARCH}.zip"
129+
APPLICATION_DIST="${PROJECT_NAME}_${TAG}_${OS}_${ARCH}.zip"
130130
else
131-
ARDUINO_LINT_DIST="${PROJECT_NAME}_${TAG}_${OS}_${ARCH}.tar.gz"
131+
APPLICATION_DIST="${PROJECT_NAME}_${TAG}_${OS}_${ARCH}.tar.gz"
132132
fi
133133

134134
# Support specifying nightly build versions (e.g., "nightly-latest") via the script argument.
135135
case "$TAG" in
136136
nightly*)
137-
DOWNLOAD_URL="https://downloads.arduino.cc/${PROJECT_NAME}/nightly/${ARDUINO_LINT_DIST}"
137+
DOWNLOAD_URL="https://downloads.arduino.cc/${PROJECT_NAME}/nightly/${APPLICATION_DIST}"
138138
;;
139139
*)
140-
DOWNLOAD_URL="https://downloads.arduino.cc/${PROJECT_NAME}/${ARDUINO_LINT_DIST}"
140+
DOWNLOAD_URL="https://downloads.arduino.cc/${PROJECT_NAME}/${APPLICATION_DIST}"
141141
;;
142142
esac
143143

144-
ARDUINO_LINT_TMP_FILE="/tmp/$ARDUINO_LINT_DIST"
144+
INSTALLATION_TMP_FILE="/tmp/$APPLICATION_DIST"
145145
echo "Downloading $DOWNLOAD_URL"
146-
httpStatusCode=$(getFile "$DOWNLOAD_URL" "$ARDUINO_LINT_TMP_FILE")
146+
httpStatusCode=$(getFile "$DOWNLOAD_URL" "$INSTALLATION_TMP_FILE")
147147
if [ "$httpStatusCode" -ne 200 ]; then
148148
echo "Did not find a release for your system: $OS $ARCH"
149149
echo "Trying to find a release using the GitHub API."
150150
LATEST_RELEASE_URL="https://api.github.com/repos/${PROJECT_OWNER}/$PROJECT_NAME/releases/tags/$TAG"
151151
echo "LATEST_RELEASE_URL=$LATEST_RELEASE_URL"
152152
get LATEST_RELEASE_JSON "$LATEST_RELEASE_URL"
153153
# || true forces this command to not catch error if grep does not find anything
154-
DOWNLOAD_URL=$(echo "$LATEST_RELEASE_JSON" | grep 'browser_' | cut -d\" -f4 | grep "$ARDUINO_LINT_DIST") || true
154+
DOWNLOAD_URL=$(echo "$LATEST_RELEASE_JSON" | grep 'browser_' | cut -d\" -f4 | grep "$APPLICATION_DIST") || true
155155
if [ -z "$DOWNLOAD_URL" ]; then
156156
echo "Sorry, we dont have a dist for your system: $OS $ARCH"
157157
fail "You can request one here: https://github.com/${PROJECT_OWNER}/$PROJECT_NAME/issues"
158158
else
159159
echo "Downloading $DOWNLOAD_URL"
160-
getFile "$DOWNLOAD_URL" "$ARDUINO_LINT_TMP_FILE"
160+
getFile "$DOWNLOAD_URL" "$INSTALLATION_TMP_FILE"
161161
fi
162162
fi
163163
}
164164

165165
installFile() {
166-
ARDUINO_LINT_TMP="/tmp/$PROJECT_NAME"
167-
mkdir -p "$ARDUINO_LINT_TMP"
166+
INSTALLATION_TMP_DIR="/tmp/$PROJECT_NAME"
167+
mkdir -p "$INSTALLATION_TMP_DIR"
168168
if [ "$OS" = "Windows" ]; then
169-
unzip -d "$ARDUINO_LINT_TMP" "$ARDUINO_LINT_TMP_FILE"
169+
unzip -d "$INSTALLATION_TMP_DIR" "$INSTALLATION_TMP_FILE"
170170
else
171-
tar xf "$ARDUINO_LINT_TMP_FILE" -C "$ARDUINO_LINT_TMP"
171+
tar xf "$INSTALLATION_TMP_FILE" -C "$INSTALLATION_TMP_DIR"
172172
fi
173-
ARDUINO_LINT_TMP_BIN="$ARDUINO_LINT_TMP/$PROJECT_NAME"
174-
cp "$ARDUINO_LINT_TMP_BIN" "$EFFECTIVE_BINDIR"
175-
rm -rf "$ARDUINO_LINT_TMP"
176-
rm -f "$ARDUINO_LINT_TMP_FILE"
173+
INSTALLATION_TMP_BIN="$INSTALLATION_TMP_DIR/$PROJECT_NAME"
174+
cp "$INSTALLATION_TMP_BIN" "$EFFECTIVE_BINDIR"
175+
rm -rf "$INSTALLATION_TMP_DIR"
176+
rm -f "$INSTALLATION_TMP_FILE"
177177
}
178178

179179
bye() {
@@ -186,24 +186,24 @@ bye() {
186186

187187
testVersion() {
188188
set +e
189-
ARDUINO_LINT="$(command -v $PROJECT_NAME)"
189+
EXECUTABLE_PATH="$(command -v $PROJECT_NAME)"
190190
if [ "$?" = "1" ]; then
191191
# $PATH is intentionally a literal in this message.
192192
# shellcheck disable=SC2016
193193
echo "$PROJECT_NAME not found. You might want to add \"$EFFECTIVE_BINDIR\" to your "'$PATH'
194194
else
195195
# Convert to resolved, absolute paths before comparison
196-
ARDUINO_LINT_REALPATH="$(cd -- "$(dirname -- "$ARDUINO_LINT")" && pwd -P)"
196+
EXECUTABLE_REALPATH="$(cd -- "$(dirname -- "$EXECUTABLE_PATH")" && pwd -P)"
197197
EFFECTIVE_BINDIR_REALPATH="$(cd -- "$EFFECTIVE_BINDIR" && pwd -P)"
198-
if [ "$ARDUINO_LINT_REALPATH" != "$EFFECTIVE_BINDIR_REALPATH" ]; then
198+
if [ "$EXECUTABLE_REALPATH" != "$EFFECTIVE_BINDIR_REALPATH" ]; then
199199
# shellcheck disable=SC2016
200-
echo "An existing $PROJECT_NAME was found at $ARDUINO_LINT. Please prepend \"$EFFECTIVE_BINDIR\" to your "'$PATH'" or remove the existing one."
200+
echo "An existing $PROJECT_NAME was found at $EXECUTABLE_PATH. Please prepend \"$EFFECTIVE_BINDIR\" to your "'$PATH'" or remove the existing one."
201201
fi
202202
fi
203203

204204
set -e
205-
ARDUINO_LINT_VERSION="$("$EFFECTIVE_BINDIR/$PROJECT_NAME" --version)"
206-
echo "$ARDUINO_LINT_VERSION installed successfully in $EFFECTIVE_BINDIR"
205+
APPLICATION_VERSION="$("$EFFECTIVE_BINDIR/$PROJECT_NAME" --version)"
206+
echo "$APPLICATION_VERSION installed successfully in $EFFECTIVE_BINDIR"
207207
}
208208

209209
# Execution

0 commit comments

Comments
 (0)