diff --git a/README.md b/README.md index 485e5c5..3516e6f 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,14 @@ ## Submodules - Initialization and Updating -There are several AUR packages added as submodules inside [pkg](pkg). +There are several [AUR](https://aur.archlinux.org/) packages added as submodules inside [pkg](pkg). See [build-pkg/pkglist-AUR.txt](build-pkg/pkglist-AUR.txt) for a full list. They were added in the following manner: ```shell -AUR=(xorg-meta riseup-vpn nordic-kde-git ...) - -for pkg in "${AUR[@]}"; do - git submodule add "https://aur.archlinux.org/${pkg}.git" pkg/"${pkg}" -done +AUR_PKG=xorg-meta +git submodule add "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}" ``` To initialize the submodules, run @@ -25,10 +22,9 @@ To update all submodules and add those who received an update to [build-pkg/pkglist.tmp](build-pkg/pkglist.tmp), run ```shell -git submodule foreach 'if git pull | grep '\''^Updating'\''; then printf " %s" "$(basename $sm_path)" >> $toplevel/build-pkg/pkglist.tmp; fi' +./git-pull ``` - ## Build packages from source Fork this repository. @@ -44,8 +40,7 @@ Then and adjust the following files: Build [de-p1st-repo](pkg/de-p1st-repo): ```shell -cd build-pkg -sudo docker-compose run --rm makepkg de-p1st-repo +sudo docker-compose -f build-pkg/docker-compose.yml run --rm makepkg de-p1st-repo ``` Install it on your build-machine and your mirror-server: @@ -60,9 +55,14 @@ sudo pacman -U out/de-p1st-repo*.pkg.tar.* Then you can start building all packages and adding them to your mirror-server: ```shell -./build-all.sh +./build-pkg/build-all ``` +## Build outdated AUR packages + +```shell +./build-pkg/pull-and-build-outdated +``` ## Install Arch Linux @@ -71,4 +71,4 @@ See [pkg/de-p1st-installer/README.md](pkg/de-p1st-installer/README.md) ## Notes and TODOs -See [notes.md](notes.md) \ No newline at end of file +See [notes.md](notes.md) diff --git a/build-pkg/build-all.sh b/build-pkg/build-all similarity index 100% rename from build-pkg/build-all.sh rename to build-pkg/build-all diff --git a/build-pkg/build-all-without-docker.sh b/build-pkg/build-all-without-docker.sh index 049a1aa..87e8f0a 100755 --- a/build-pkg/build-all-without-docker.sh +++ b/build-pkg/build-all-without-docker.sh @@ -2,6 +2,7 @@ echo "Please consider using ./build-all.sh instead. This script is outdated." + function build-with-aurutils() { aur build -c } diff --git a/build-pkg/pull-and-build-outdated b/build-pkg/pull-and-build-outdated new file mode 100755 index 0000000..2702039 --- /dev/null +++ b/build-pkg/pull-and-build-outdated @@ -0,0 +1,5 @@ +#!/bin/bash + +../git-pull || exit $? +./build-all pkglist.tmp || exit $? +rm pkglist.tmp diff --git a/git-pull b/git-pull new file mode 100755 index 0000000..dd2e72b --- /dev/null +++ b/git-pull @@ -0,0 +1,4 @@ +#!/bin/bash + +git pull || exit $? +git submodule foreach 'if git pull | grep '\''^Updating'\''; then printf " %s" "$(basename $sm_path)" >> $toplevel/build-pkg/pkglist.tmp; fi' diff --git a/pkg/intellij-idea-ultimate-edition b/pkg/intellij-idea-ultimate-edition index 88b7549..cde6f06 160000 --- a/pkg/intellij-idea-ultimate-edition +++ b/pkg/intellij-idea-ultimate-edition @@ -1 +1 @@ -Subproject commit 88b7549c433a7a2fbc9c6a3a17387f76e0e7bf98 +Subproject commit cde6f0683a9af9011f68e232f6f1cadf97ff8897 diff --git a/pkg/librist b/pkg/librist index 8ba41d7..00dce7e 160000 --- a/pkg/librist +++ b/pkg/librist @@ -1 +1 @@ -Subproject commit 8ba41d7f37c4eaf756da834ef8560b07f36020f9 +Subproject commit 00dce7e1c33439e78bbdc751efe0dfcfacd8570d diff --git a/pkg/opencl-amd b/pkg/opencl-amd index 2a3babd..e092ee7 160000 --- a/pkg/opencl-amd +++ b/pkg/opencl-amd @@ -1 +1 @@ -Subproject commit 2a3babdd387bc3c187b21718428859134fc03e70 +Subproject commit e092ee7eb5e8cf496256c70177bd6c07f2a059c0 diff --git a/pkg/pycharm-professional b/pkg/pycharm-professional index 2a5cca3..665a46d 160000 --- a/pkg/pycharm-professional +++ b/pkg/pycharm-professional @@ -1 +1 @@ -Subproject commit 2a5cca3011d570a631271735d24d8c3939fa00b1 +Subproject commit 665a46d9cebf40d563b9cf090a42f2d0083a86cd diff --git a/pkg/signal-desktop-beta-bin b/pkg/signal-desktop-beta-bin index 4d6600b..db2e1e9 160000 --- a/pkg/signal-desktop-beta-bin +++ b/pkg/signal-desktop-beta-bin @@ -1 +1 @@ -Subproject commit 4d6600b719ff69ca4715445853f37cd5a2a9d859 +Subproject commit db2e1e91fca61cd3258c45bfa38e361624a76a94 diff --git a/pkg/tagspaces-bin b/pkg/tagspaces-bin index 88d820c..5d064a8 160000 --- a/pkg/tagspaces-bin +++ b/pkg/tagspaces-bin @@ -1 +1 @@ -Subproject commit 88d820ceb7b8029761842ef03000fa76a704f5c8 +Subproject commit 5d064a8d97669174898f21764bd738285fd340b2 diff --git a/pkg/zoom b/pkg/zoom index 3779bcb..760c9b9 160000 --- a/pkg/zoom +++ b/pkg/zoom @@ -1 +1 @@ -Subproject commit 3779bcb7ad101ed8b9bebff0f14b4500ab17443a +Subproject commit 760c9b944464f4a8d4a9d013650a9ad24f95cf73