JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't break downloads if GITHUB_SOURCE is unset

Browse Source 
- fixes f200587b86 from https://github.com/armbian/build/pull/5791
This commit is contained in:
Ricardo Pardini
2023-10-10 11:14:52 +02:00
committed by Igor
parent 2c8d551422
commit 1c5add5e51
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/functions/general/bat-cat.sh
View File

@@ -54,7 +54,7 @@ function run_tool_batcat() {
declare BATCAT_FN="bat-v${BATCAT_VERSION}-${BATCAT_ARCH_OS}"
declare BATCAT_FN_TARXZ="${BATCAT_FN}.tar.gz"
declare DOWN_URL="${GITHUB_SOURCE}/sharkdp/bat/releases/download/v${BATCAT_VERSION}/${BATCAT_FN_TARXZ}"
declare DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/sharkdp/bat/releases/download/v${BATCAT_VERSION}/${BATCAT_FN_TARXZ}"
declare BATCAT_BIN="${DIR_BATCAT}/${BATCAT_FN}-bin"
declare ACTUAL_VERSION
@@ -116,7 +116,7 @@ function try_download_batcat_tooling() {
run_host_command_logged rm -rf "${BATCAT_BIN}.tar.gz"
# EXTRA: get more syntaxes for batcat. We need Debian syntax for CONTROL files, etc.
run_host_command_logged wget --no-verbose --progress=dot:giga -O "${DIR_BATCAT}/sublime-debian.tar.gz.tmp" "${GITHUB_SOURCE}/barnumbirr/sublime-debian/archive/refs/heads/master.tar.gz"
run_host_command_logged wget --no-verbose --progress=dot:giga -O "${DIR_BATCAT}/sublime-debian.tar.gz.tmp" "${GITHUB_SOURCE:-"https://github.com"}/barnumbirr/sublime-debian/archive/refs/heads/master.tar.gz"
run_host_command_logged mkdir -p "${DIR_BATCAT}/temp-debian-syntax"
run_host_command_logged tar -xzf "${DIR_BATCAT}/sublime-debian.tar.gz.tmp" -C "${DIR_BATCAT}/temp-debian-syntax" sublime-debian-master/Syntaxes

2
lib/functions/general/oci-oras.sh
View File

@@ -55,7 +55,7 @@ function run_tool_oras() {
declare ORAS_FN="oras_${ORAS_VERSION}_${ORAS_OS}_${ORAS_ARCH}"
declare ORAS_FN_TARXZ="${ORAS_FN}.tar.gz"
declare DOWN_URL="${GITHUB_SOURCE}/oras-project/oras/releases/download/v${ORAS_VERSION}/${ORAS_FN_TARXZ}"
declare DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/oras-project/oras/releases/download/v${ORAS_VERSION}/${ORAS_FN_TARXZ}"
declare ORAS_BIN="${DIR_ORAS}/${ORAS_FN}"
declare ACTUAL_VERSION

2
lib/functions/general/shellcheck.sh
View File

@@ -94,7 +94,7 @@ function run_tool_shellcheck() {
declare SHELLCHECK_FN="shellcheck-v${SHELLCHECK_VERSION}.${SHELLCHECK_OS}.${SHELLCHECK_ARCH}"
declare SHELLCHECK_FN_TARXZ="${SHELLCHECK_FN}.tar.xz"
declare DOWN_URL="${GITHUB_SOURCE}/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
declare DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
declare SHELLCHECK_BIN="${DIR_SHELLCHECK}/${SHELLCHECK_FN}"
declare ACTUAL_VERSION

2
lib/tools/shellcheck.sh
View File

@@ -43,7 +43,7 @@ esac
SHELLCHECK_FN="shellcheck-v${SHELLCHECK_VERSION}.${SHELLCHECK_OS}.${SHELLCHECK_ARCH}"
SHELLCHECK_FN_TARXZ="${SHELLCHECK_FN}.tar.xz"
DOWN_URL="${GITHUB_SOURCE:-https://github.com}/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
SHELLCHECK_BIN="${DIR_SHELLCHECK}/${SHELLCHECK_FN}"
if [[ ! -f "${SHELLCHECK_BIN}" ]]; then

2
lib/tools/shellfmt.sh
View File

@@ -38,7 +38,7 @@ case "$MACHINE" in
esac
SHELLFMT_FN="shfmt_v${SHELLFMT_VERSION}_${SHELLFMT_OS}_${SHELLFMT_ARCH}"
DOWN_URL="${GITHUB_SOURCE:-https://github.com}/mvdan/sh/releases/download/v${SHELLFMT_VERSION}/${SHELLFMT_FN}"
DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/mvdan/sh/releases/download/v${SHELLFMT_VERSION}/${SHELLFMT_FN}"
SHELLFMT_BIN="${DIR_SHELLFMT}/${SHELLFMT_FN}"
echo "MACHINE: ${MACHINE}"