Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-22 10:10:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bastille bootstrap + update command

Browse Source
This commit is contained in:
Jose
2020-08-26 14:47:27 -04:00
parent 8b196ffaeb
commit abd80b151f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usr/local/share/bastille/bootstrap.sh
View File

@@ -77,7 +77,7 @@ validate_release_url() {
echo -e "${COLOR_GREEN}Bootstrapping ${PLATFORM_OS} distfiles...${COLOR_RESET}" echo -e "${COLOR_GREEN}Bootstrapping ${PLATFORM_OS} distfiles...${COLOR_RESET}"
# Alternate RELEASE/ARCH fetch support # Alternate RELEASE/ARCH fetch support
if [ "${ARCH}" = "--i386" -o "${ARCH}" = "--32bit" ]; then if [ "${OPTION}" = "--i386" -o "${OPTION}" = "--32bit" ]; then
ARCH="i386" ARCH="i386"
RELEASE="${RELEASE}-${ARCH}" RELEASE="${RELEASE}-${ARCH}"
fi fi
@@ -344,20 +344,18 @@ bootstrap_template() {
HW_MACHINE=$(sysctl hw.machine | awk '{ print $2 }') HW_MACHINE=$(sysctl hw.machine | awk '{ print $2 }')
HW_MACHINE_ARCH=$(sysctl hw.machine_arch | awk '{ print $2 }') HW_MACHINE_ARCH=$(sysctl hw.machine_arch | awk '{ print $2 }')
RELEASE="${1}" RELEASE="${1}"
ARCH="${2}" OPTION="${2}"
# Alternate RELEASE/ARCH fetch support(experimental) # Alternate RELEASE/ARCH fetch support(experimental)
if [ -n "${ARCH}" ] && [ "${ARCH}" != "${HW_MACHINE}" ]; then if [ -n "${OPTION}" ] && [ "${OPTION}" != "${HW_MACHINE}" ] && [ "${OPTION}" != "update" ]; then
# Supported architectures # Supported architectures
if [ "${ARCH}" = "--i386" -o "${ARCH}" = "--32bit" ]; then if [ "${OPTION}" = "--i386" -o "${OPTION}" = "--32bit" ]; then
HW_MACHINE="i386" HW_MACHINE="i386"
HW_MACHINE_ARCH="i386" HW_MACHINE_ARCH="i386"
else else
echo -e "${COLOR_RED}Unsupported architecture.${COLOR_RESET}" echo -e "${COLOR_RED}Unsupported architecture.${COLOR_RESET}"
exit 1 exit 1
fi fi
else
ARCH=""
fi fi
## Filter sane release names ## Filter sane release names
@@ -423,7 +421,7 @@ http?://github.com/*/*|http?://gitlab.com/*/*)
;; ;;
esac esac
case "${2}" in case "${OPTION}" in
update) update)
bastille update "${RELEASE}" bastille update "${RELEASE}"
;; ;;