Skip to content

Commit

Permalink
Submodule removed
Browse files Browse the repository at this point in the history
  • Loading branch information
gsanhueza committed Jul 21, 2024
1 parent 68ec14f commit 5b825c8
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
work/
airootfs/root/ArchScripts
airootfs/root/pkg
TEMPMNT/
out/
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

1 change: 0 additions & 1 deletion airootfs/root/ArchScripts
Submodule ArchScripts deleted from 4d6558
4 changes: 3 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ set -e -u
# Make ${WORK_DIR} directory
mkdir -p "${WORK_DIR}"

# Update ArchScripts
run_once update_archscripts

# Generate local repo
run_once make_local_repo

# Run mkarchiso
#printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
mkarchiso "$@" "${BASE_PATH%/*}"

# Remove ${WORK_DIR} folder
Expand Down
13 changes: 13 additions & 0 deletions utilities/custom_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

BASE_DIR=`dirname $(readlink -f $0)`
DETECTOR_PATH="${BASE_DIR}/utilities/detect_packages.sh"
ARCHSCRIPTS_GIT="https://github.com/gsanhueza/ArchScripts.git"

# Whether to update cache every time, or keep what's available now.
UPDATE_CACHE=1
Expand All @@ -14,6 +15,18 @@ run_once() {
fi
}

# Update ArchScripts
update_archscripts() {
OWNER=${SUDO_USER:-$USER}

# Ensure ArchScripts are available first
if [ ! -d ${BASE_DIR}/airootfs/root/ArchScripts ]; then
sudo -u ${OWNER} git clone ${ARCHSCRIPTS_GIT} ${BASE_DIR}/airootfs/root/ArchScripts
fi

sudo -u ${OWNER} git -C ${BASE_DIR}/airootfs/root/ArchScripts pull
}

# Create needed folders for make_local_repo
make_folder() {
echo "Creating temporal root folder..."
Expand Down

0 comments on commit 5b825c8

Please sign in to comment.