diff options
| -rwxr-xr-x | bin/common-functions | 20 | ||||
| -rwxr-xr-x | bin/get-package-updates | 17 | ||||
| -rwxr-xr-x | conf/default.conf | 2 |
3 files changed, 22 insertions, 17 deletions
diff --git a/bin/common-functions b/bin/common-functions new file mode 100755 index 0000000..2191d01 --- /dev/null +++ b/bin/common-functions @@ -0,0 +1,20 @@ +#!/bin/bash + +# contains functions used by more than one script + +# find the PKGBUILD of a given package in a given repository +# TODO: +# _properly_ include repository of package customizations + +find_pkgbuild() { + + for prefix in "${repo_paths["packages"]}" "${repo_paths["community"]}"; do + [ -d "${prefix}/$1" ] || continue + ls "${prefix}/$1/repos/$2-"*"/PKGBUILD" 2> /dev/null && break + done | \ + tr ' ' '\n' | \ + grep -v -- '-i686/PKGBUILD$' | \ + grep -v -- '-\(staging\|testing\)-[^/]\+/PKGBUILD$' | \ + sort | \ + tail -n1 +} diff --git a/bin/get-package-updates b/bin/get-package-updates index df5cf7e..fa4f1d7 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -9,23 +9,6 @@ . "${0%/*}/../conf/default.conf" -# find the PKGBUILD of a given package in a given repository -# TODO: -# _properly_ include repository of package customizations - -find_pkgbuild() { - - for prefix in "${repo_paths["packages"]}" "${repo_paths["community"]}"; do - [ -d "${prefix}/$1" ] || continue - ls "${prefix}/$1/repos/$2-"*"/PKGBUILD" 2> /dev/null && break - done | \ - tr ' ' '\n' | \ - grep -v -- '-i686/PKGBUILD$' | \ - grep -v -- '-\(staging\|testing\)-[^/]\+/PKGBUILD$' | \ - sort | \ - tail -n1 -} - # Create a lock file for build list. exec 9> "${lock_file}" diff --git a/conf/default.conf b/conf/default.conf index 0343ba4..9da159c 100755 --- a/conf/default.conf +++ b/conf/default.conf @@ -6,6 +6,8 @@ set -e base_dir="$(dirname "$(readlink -f "$0")")/.." +. "${base_dir}/bin/common-functions" + work_dir="${base_dir}/work" declare -A repo_paths |