commit 2e1e7e24762c197db0b6649fea5b00c9dae04555
parent cddddf36f97e73585acd3d298b69cb9fd68ef87b
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Mon, 7 Apr 2025 20:22:03 +0000
move all scripts to util/ subdirectory
Diffstat:
7 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/util/build b/util/build
@@ -1,19 +1,6 @@
#!/bin/sh -xe
-cd "$(dirname "$0")"
-
-./pthbs/util/gen-filelist-sha256 files/ >.new.filelist.sha256
-if ! cmp -s filelist.sha256 .new.filelist.sha256; then
- mv .new.filelist.sha256 filelist.sha256
-else
- rm .new.filelist.sha256
-fi
-
-./pthbs/util/gen_git_commitlist sources/ >.new.commitlist.sha1
-if ! cmp -s commitlist.sha1 .new.commitlist.sha1; then
- mv .new.commitlist.sha1 commitlist.sha1
-else
- rm .new.commitlist.sha1
-fi
+cd "$(dirname "$0")/.."
+./util/generate-packages
make py-genpkgall
exec make -rs "$@"
diff --git a/util/build-and-install b/util/build-and-install
@@ -1,4 +1,4 @@
#!/bin/sh -xe
-cd "$(dirname "$0")"
-./build "$@"
+cd "$(dirname "$0")/.."
+./util/build "$@"
exec ./cache/namedenv/default/command/install-as-current-environment
diff --git a/util/generate-and-commit b/util/generate-and-commit
@@ -1,7 +1,7 @@
#!/bin/sh -xe
-cd "$(dirname "$0")"
-./generate-packages
+cd "$(dirname "$0")/.."
+./util/generate-packages
git commit -a "$@"
git push origin trunk
-./submodules-update-branch
+./util/submodules-update-branch
git submodule foreach git push origin mrrl-trunk --force
diff --git a/util/generate-packages b/util/generate-packages
@@ -1,5 +1,5 @@
#!/bin/sh -xe
-cd "$(dirname "$0")"
+cd "$(dirname "$0")/.."
./pthbs/util/gen-filelist-sha256 files/ >.new.filelist.sha256
if ! cmp -s filelist.sha256 .new.filelist.sha256; then
diff --git a/util/push-www_te2000 b/util/push-www_te2000
@@ -1,5 +1,5 @@
#!/bin/zsh
setopt no_unset extended_glob
#set -x
-cd ${0:h}
+cd ${0:h}/..
for d in . pthbs pthbs_genpkgpy sources/*(/); do (cd $d && git remote | grep -q www_te2000 && echo $d && git push www_te2000); done
diff --git a/util/submodules-update-branch b/util/submodules-update-branch
@@ -4,7 +4,7 @@ fatal() {
printf >&2 '%s: fatal: %s\n' "$prog" "$*"
exit 1
}
-cd "$(dirname "$0")"
+cd "$(dirname "$0")../"
prefix=mrrl-
branch=$(git branch --show-current --format '%(refname:short)')
branch=trunk
diff --git a/util/update-links b/util/update-links
@@ -1,3 +1,3 @@
#!/bin/zsh
-$0:h/files/update-links || exit $?
-$0:h/sources/update-links || exit $?
+$0:h/../files/update-links || exit $?
+$0:h/../sources/update-links || exit $?
