Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update sourcing of secondary scripts to work when called from any directory

Browse Source
This commit is contained in:
Jordan Carlin 2024-07-02 22:17:43 -07:00
parent 2a78a65f69
commit b6ad0571ac
No known key found for this signature in database
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/wally-package-install.sh
View File

@ -38,7 +38,8 @@ ENDC='\033[0m'
# If run standalone, determine distro information. Otherwise, use info from main install script # If run standalone, determine distro information. Otherwise, use info from main install script
if [ -z "$FAMILY" ]; then if [ -z "$FAMILY" ]; then
source wally-distro-check.sh dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${dir}"/wally-distro-check.sh
fi fi
# Generate list of packages to install, determined based on distro # Generate list of packages to install, determined based on distro

7
bin/wally-tool-chain-install.sh
View File

@ -36,6 +36,7 @@ NUM_THREADS=8 # for >= 32GiB
#NUM_THREADS=16 # for >= 64GiB #NUM_THREADS=16 # for >= 64GiB
set -e # break on error set -e # break on error
dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# Colors # Colors
BOLD='\033[1m' BOLD='\033[1m'
@ -48,7 +49,7 @@ FAIL_COLOR='\033[91m'
ENDC='\033[0m' ENDC='\033[0m'
# Get Linux distro and version # Get Linux distro and version
source wally-distro-check.sh source "${dir}"/wally-distro-check.sh
# Check if root # Check if root
ROOT=$( [ "${EUID:=$(id -u)}" = 0 ] && echo true || echo false); ROOT=$( [ "${EUID:=$(id -u)}" = 0 ] && echo true || echo false);
@ -70,9 +71,9 @@ echo "Installation path: $RISCV"
# Install/update packages if root. Otherwise, check that packages are already installed. # Install/update packages if root. Otherwise, check that packages are already installed.
if [ "$ROOT" = true ]; then if [ "$ROOT" = true ]; then
source wally-package-install.sh source "${dir}"/wally-package-install.sh
else else
source wally-package-install.sh --check source "${dir}"/wally-package-install.sh --check
fi fi
if [ "$FAMILY" = rhel ]; then if [ "$FAMILY" = rhel ]; then