2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Better package list handling

Browse source
This commit is contained in:
2Shirt 2017-12-12 11:18:15 -08:00
parent 2af3e552d4
commit 87e651cb07
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
.linux_items/AUR-Packages → .linux_items/packages/aur
View file

7
.linux_items/packages/dependencies Normal file
View file

@ -0,0 +1,7 @@
archiso
attr
base-devel
curl
libewf
progsreiserfs
rsync

13
Build Linux
View file

@ -6,7 +6,6 @@
ROOT_DIR="$(realpath $(dirname "$0"))" ROOT_DIR="$(realpath $(dirname "$0"))"
BUILD_DIR="$ROOT_DIR/BUILD_LINUX" BUILD_DIR="$ROOT_DIR/BUILD_LINUX"
ARCHLIVE_DIR="$BUILD_DIR/Archlive" ARCHLIVE_DIR="$BUILD_DIR/Archlive"
AUR_PACKAGES="$ROOT_DIR/.linux_items/AUR-Packages"
CUSTOM_REPO_DIR="$BUILD_DIR/CustomRepo" CUSTOM_REPO_DIR="$BUILD_DIR/CustomRepo"
DATE="$(date +%F)" DATE="$(date +%F)"
DATETIME="$(date +%F_%H%M)" DATETIME="$(date +%F_%H%M)"
@ -108,7 +107,7 @@ function update_repo() {
mkdir "$CUSTOM_REPO_DIR" 2>/dev/null mkdir "$CUSTOM_REPO_DIR" 2>/dev/null
mkdir "$TMP_DIR" 2>/dev/null mkdir "$TMP_DIR" 2>/dev/null
pushd "$TMP_DIR" >/dev/null pushd "$TMP_DIR" >/dev/null
for p in $(cat "$AUR_PACKAGES"); do while read -r p; do
echo "Building: $p" echo "Building: $p"
curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz
tar xf $p.tar.gz tar xf $p.tar.gz
@ -116,7 +115,7 @@ function update_repo() {
makepkg -s --noconfirm makepkg -s --noconfirm
popd >/dev/null popd >/dev/null
mv -n $p/*xz "$CUSTOM_REPO_DIR"/ mv -n $p/*xz "$CUSTOM_REPO_DIR"/
done done < "$ROOT_DIR/.linux_items/packages/aur"
popd >/dev/null popd >/dev/null
# Build custom repo database # Build custom repo database
@ -126,8 +125,12 @@ function update_repo() {
} }
function install_deps() { function install_deps() {
echo "Installing dependancies..." echo "Installing dependencies..."
run_elevated pacman -Syu --needed --noconfirm archiso attr base-devel curl libewf progsreiserfs rsync packages=
while read -r line; do
packages="$packages $line"
done < "$ROOT_DIR/.linux_items/packages/dependencies"
run_elevated pacman -Syu --needed --noconfirm $packages
} }
function build_arch() { function build_arch() {