aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2014-11-20 20:20:08 +0000
committerJohannes Löthberg <johannes@kyriasis.com>2014-11-20 20:20:08 +0000
commit50efb6f4ebffe1d0f3bb2232397b4fca62922542 (patch)
treefd9ab83c711cbf9bf170d6a9f522776349e82d8e
parent23970267de35293efb5a21bf39434431915913c7 (diff)
downloadvcs-rebuild-50efb6f4ebffe1d0f3bb2232397b4fca62922542.tar.xz
fix get_repo_sha and clean_packages repo location
-rwxr-xr-xbuild-updated-packages.bash5
-rwxr-xr-xclean_packages4
-rw-r--r--config.bash4
-rwxr-xr-xdb-build2
-rw-r--r--package-list.bash1
5 files changed, 8 insertions, 8 deletions
diff --git a/build-updated-packages.bash b/build-updated-packages.bash
index 3993cde..cd76640 100755
--- a/build-updated-packages.bash
+++ b/build-updated-packages.bash
@@ -19,7 +19,7 @@ get_pkgver_sha() {
get_repo_sha() {
shopt -s nullglob
local packages
- for f in "$REPO"/"$1"*.tar.xz; do
+ for f in "$REPO_ROOT"/"$1"*.tar.xz; do
package="${f##*/}"
package="${package//-git-/-git }"
@@ -51,6 +51,7 @@ main() {
new_head=$(get_pkgver_sha "$package")
if [[ "${old_version[$package]}" != "$new_head" ]]; then
+ printf "%-30s %-25s %s\n" "$package" "${old_version[$package]}" "$new_head"
needs_rebuild+=("$package")
fi
done
@@ -58,7 +59,7 @@ main() {
if [[ ${#needs_rebuild[@]} -eq 0 ]]; then
printf "%s\n" "No VCS packages found that needs to be rebuilt."
else
- printf "Packages that needs to be rebuilt:"
+ printf "%s\n" "Packages that needs to be rebuilt:"
printf "%s\n" "${needs_rebuild[@]}"
for package in "${needs_rebuild[@]}"; do
diff --git a/clean_packages b/clean_packages
index 45ccdac..1c3f48b 100755
--- a/clean_packages
+++ b/clean_packages
@@ -2,6 +2,6 @@
source $(dirname $0)/config.bash
-paccache -c "$PKGDEST" -k1 -m "$POOL"/trash
-find -L "$REPODIR" -type l -delete
+paccache -c "$PKGDEST" -k1 -m "$REPO_POOL"/trash
+find -L "$REPO_ROOT" -type l -delete
find -L "$PKGBUILD_DIR" -type l -delete
diff --git a/config.bash b/config.bash
index 6bf944f..aae575e 100644
--- a/config.bash
+++ b/config.bash
@@ -5,5 +5,5 @@ PKGBUILD_DIR="$HOME"/packaging/pkgbuilds
REPOSE_BINARY="$HOME"/packaging/vodik-repose/repose
DATABASE=kyriasis
-ROOT="$HOME"/packaging/repo
-POOL="$HOME"/packaging/built_packages
+REPO_ROOT="$HOME"/packaging/repo
+REPO_POOL="$HOME"/packaging/built_packages
diff --git a/db-build b/db-build
index 5853a7b..e9a05aa 100755
--- a/db-build
+++ b/db-build
@@ -5,7 +5,7 @@
main() {
source $(dirname $0)/config.bash
- "$REPOSE_BINARY" "$DATABASE" --root "$ROOT" --pool "$POOL" -v --xz --files
+ "$REPOSE_BINARY" "$DATABASE" --root "$REPO_ROOT" --pool "$REPO_POOL" -v --xz --files
}
main "$@"
diff --git a/package-list.bash b/package-list.bash
index 3bfd2b0..dbf2710 100644
--- a/package-list.bash
+++ b/package-list.bash
@@ -5,7 +5,6 @@ declare packages=(
"elementary-xfce-icons-git"
"goobook-git"
"gvim-hg"
- "i3pystatus-git"
"isync-git"
"j4-dmenu-desktop-git"
"kittypack-git"