|
|
@ -3,7 +3,7 @@
|
|
|
|
# Program name
|
|
|
|
# Program name
|
|
|
|
PROGRAM_NAME="OctoPower"
|
|
|
|
PROGRAM_NAME="OctoPower"
|
|
|
|
PROGRAM_CODE="octopower"
|
|
|
|
PROGRAM_CODE="octopower"
|
|
|
|
PROGRAM_VERSION="2.0.1"
|
|
|
|
PROGRAM_VERSION="2.0.3"
|
|
|
|
PROGRAM_V="2.0"
|
|
|
|
PROGRAM_V="2.0"
|
|
|
|
PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}"
|
|
|
|
PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}"
|
|
|
|
|
|
|
|
|
|
|
@ -710,12 +710,19 @@ command -v sed >/dev/null 2>&1 || {
|
|
|
|
setValueFromJson 'VDM_BRANCH' '.branch' "${repository}" || VDM_BRANCH="default"
|
|
|
|
setValueFromJson 'VDM_BRANCH' '.branch' "${repository}" || VDM_BRANCH="default"
|
|
|
|
setValueFromJson 'VDM_API_NAME' '.api_name' "${repository}" || VDM_API_NAME="VDM_GLOBAL_API"
|
|
|
|
setValueFromJson 'VDM_API_NAME' '.api_name' "${repository}" || VDM_API_NAME="VDM_GLOBAL_API"
|
|
|
|
setValueFromJson 'VDM_TOKEN_NAME' '.token_name' "${repository}" || VDM_TOKEN_NAME="VDM_GLOBAL_TOKEN"
|
|
|
|
setValueFromJson 'VDM_TOKEN_NAME' '.token_name' "${repository}" || VDM_TOKEN_NAME="VDM_GLOBAL_TOKEN"
|
|
|
|
|
|
|
|
# Now check if the repository has its own `.api` and `.token` values
|
|
|
|
|
|
|
|
# If present, override the global values
|
|
|
|
|
|
|
|
if setValueFromJson 'VDM_API' '.api' "${repository}"; then
|
|
|
|
|
|
|
|
setValueFromJson 'VDM_TOKEN' '.token' "${repository}" || VDM_TOKEN=''
|
|
|
|
|
|
|
|
else
|
|
|
|
# set the package (api/toke)
|
|
|
|
# set the package (api/toke)
|
|
|
|
tmp_api=${!VDM_API_NAME}
|
|
|
|
tmp_api=${!VDM_API_NAME}
|
|
|
|
tmp_token=${!VDM_TOKEN_NAME}
|
|
|
|
tmp_token=${!VDM_TOKEN_NAME}
|
|
|
|
# allow direct overriding (api/toke)
|
|
|
|
# allow direct overriding (api)
|
|
|
|
getConfigValue 'VDM_API' '.repository.api' false || VDM_API="${tmp_api}"
|
|
|
|
getConfigValue 'VDM_API' '.repository.api' false || VDM_API="${tmp_api}"
|
|
|
|
|
|
|
|
# allow direct overriding (toke)
|
|
|
|
getConfigValue 'VDM_TOKEN' '.repository.token' false || VDM_TOKEN="${tmp_token}"
|
|
|
|
getConfigValue 'VDM_TOKEN' '.repository.token' false || VDM_TOKEN="${tmp_token}"
|
|
|
|
|
|
|
|
fi
|
|
|
|
# check if we have some errors already
|
|
|
|
# check if we have some errors already
|
|
|
|
if $has_error; then
|
|
|
|
if $has_error; then
|
|
|
|
clearFileEnv
|
|
|
|
clearFileEnv
|
|
|
@ -1778,7 +1785,7 @@ command -v sed >/dev/null 2>&1 || {
|
|
|
|
sudo mv "/usr/local/bin/${PROGRAM_CODE}" "/usr/local/bin/${PROGRAM_CODE}.bak"
|
|
|
|
sudo mv "/usr/local/bin/${PROGRAM_CODE}" "/usr/local/bin/${PROGRAM_CODE}.bak"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
# pull the latest version. Master is always the latest
|
|
|
|
# pull the latest version. Master is always the latest
|
|
|
|
if sudo curl --fail -L "https://git.vdm.dev/api/v1/repos/octoleo/${PROGRAM_CODE}/raw/src/${PROGRAM_CODE}?ref=${branch:-master}" -o "/usr/local/bin/${PROGRAM_CODE}" 2>/dev/null; then
|
|
|
|
if sudo curl --fail -L "https://raw.githubusercontent.com/octoleo/${PROGRAM_CODE}/refs/heads/${branch:-master}/src/${PROGRAM_CODE}" -o "/usr/local/bin/${PROGRAM_CODE}" 2>/dev/null; then
|
|
|
|
# give success message
|
|
|
|
# give success message
|
|
|
|
echo "[success] Update was successful."
|
|
|
|
echo "[success] Update was successful."
|
|
|
|
# do we have a backup
|
|
|
|
# do we have a backup
|
|
|
|