From 0ee799f20777ce58ce527dea4e30ce46afddf6a9 Mon Sep 17 00:00:00 2001 From: Dor dicke Gind Date: Fri, 15 Jul 2022 20:17:31 +0200 Subject: [PATCH] [TASK] add skel stuff and fix script --- .gitmodules | 9 +++++++++ gind-etc-skel-basic | 1 + gind-etc-skel-dirty | 1 + gind-etc-skel-games | 1 + gind-repo-makepkg.sh | 22 ++-------------------- 5 files changed, 14 insertions(+), 20 deletions(-) create mode 160000 gind-etc-skel-basic create mode 160000 gind-etc-skel-dirty create mode 160000 gind-etc-skel-games diff --git a/.gitmodules b/.gitmodules index 4c9eecc..418818a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,3 +64,12 @@ [submodule "wine-staging-opt-3.21"] path = wine-staging-opt-3.21 url = https://gindserver.duckdns.org/gitea/drdickgind/wine-staging-opt-3.21.git +[submodule "gind-etc-skel-dirty"] + path = gind-etc-skel-dirty + url = https://gindserver.duckdns.org/gitea/drdickgind/pkgbuild-gind-etc-skel-dirty.git +[submodule "gind-etc-skel-basic"] + path = gind-etc-skel-basic + url = https://gindserver.duckdns.org/gitea/drdickgind/pkgbuild-gind-etc-skel-basic.git +[submodule "gind-etc-skel-games"] + path = gind-etc-skel-games + url = https://gindserver.duckdns.org/gitea/drdickgind/pkgbuild-gind-etc-skel-games.git diff --git a/gind-etc-skel-basic b/gind-etc-skel-basic new file mode 160000 index 0000000..250eb78 --- /dev/null +++ b/gind-etc-skel-basic @@ -0,0 +1 @@ +Subproject commit 250eb780960a3760290b9f7f7a01e96871c57e30 diff --git a/gind-etc-skel-dirty b/gind-etc-skel-dirty new file mode 160000 index 0000000..a4c3e79 --- /dev/null +++ b/gind-etc-skel-dirty @@ -0,0 +1 @@ +Subproject commit a4c3e79c7de8801accd451a99a09cffa31fd48f9 diff --git a/gind-etc-skel-games b/gind-etc-skel-games new file mode 160000 index 0000000..0571145 --- /dev/null +++ b/gind-etc-skel-games @@ -0,0 +1 @@ +Subproject commit 0571145de3efd8afe006ec28a059979669926b30 diff --git a/gind-repo-makepkg.sh b/gind-repo-makepkg.sh index 37cc873..db2e965 100755 --- a/gind-repo-makepkg.sh +++ b/gind-repo-makepkg.sh @@ -2,23 +2,5 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd) cd $SCRIPT_DIR -git submodule update --recursive -git submodule foreach ' - #creepy linux magic 2>&1 also pipes through stderr, not needed anymore - #isUpToDate=$(git fetch -v 2>&1 | grep "aktuell") - #isUpToDate="" - expireTimeNotifyOSD=10000 - currentId=1 - tmpFile=/tmp/currentNotifyId - # gets the current notify id from our tmp file - if [ -s $tmpFile ]; then - currentId=$(cat $tmpFile) - fi - - notify-send "Start makepkg for $name" -p -t $expireTimeNotifyOSD -r $currentId -i software-update-available > $tmpFile - #fixes issue with makepkg ... git repo is not a clone of ... - unset GIT_DIR - makepkg - repo-add /mnt/pi-usb-ssd/gind-repo/x86_64/gind-repo.db.tar.gz $name*.pkg.tar.zst - cp -n $name*.pkg.tar.zst /mnt/pi-usb-ssd/gind-repo/x86_64/ -' \ No newline at end of file +git submodule update --remote +git submodule foreach "../makepkg-and-update-db.sh $1" \ No newline at end of file