diff options
| author | Allan McRae <allan@archlinux.org> | 2015-05-13 15:46:33 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-05-19 23:43:00 +1000 |
| commit | 23e3c4852649a8803d049f81a6eab660f036f9cd (patch) | |
| tree | 3acc4d1f2f3f3cf29c8346eeb158e81458298d61 | |
| parent | 15b6cecdd5353d1ce8d8a9747ea9e55477ceb3fb (diff) | |
libmakepkg: move more functions for extracting information from PKGBIULDs
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/libmakepkg/util/pkgbuild.sh | 47 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 45 |
2 files changed, 46 insertions, 46 deletions
diff --git a/scripts/libmakepkg/util/pkgbuild.sh b/scripts/libmakepkg/util/pkgbuild.sh index 17e4cc56..2423a83d 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh +++ b/scripts/libmakepkg/util/pkgbuild.sh @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ] && return +[[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return LIBMAKEPKG_UTIL_PKGBUILD_SH=1 @@ -144,3 +144,48 @@ get_pkg_arch() { fi fi } + +print_all_package_names() { + local version=$(get_full_version) + local architecture pkg opts a + for pkg in ${pkgname[@]}; do + get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + get_pkgbuild_attribute "$pkg" 'options' 1 opts + for a in ${architecture[@]}; do + printf "%s-%s-%s\n" "$pkg" "$version" "$a" + if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" + fi + done + done +} + +get_all_sources() { + local aggregate l a + + if array_build l 'source'; then + aggregate+=("${l[@]}") + fi + + for a in "${arch[@]}"; do + if array_build l "source_$a"; then + aggregate+=("${l[@]}") + fi + done + + array_build "$1" "aggregate" +} + +get_all_sources_for_arch() { + local aggregate l + + if array_build l 'source'; then + aggregate+=("${l[@]}") + fi + + if array_build l "source_$CARCH"; then + aggregate+=("${l[@]}") + fi + + array_build "$1" "aggregate" +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f88ec3cc..cc1fea49 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -739,36 +739,6 @@ extract_svn() { cp -au "$dir" "$srcdir" } -get_all_sources() { - local aggregate l a - - if array_build l 'source'; then - aggregate+=("${l[@]}") - fi - - for a in "${arch[@]}"; do - if array_build l "source_$a"; then - aggregate+=("${l[@]}") - fi - done - - array_build "$1" "aggregate" -} - -get_all_sources_for_arch() { - local aggregate l - - if array_build l 'source'; then - aggregate+=("${l[@]}") - fi - - if array_build l "source_$CARCH"; then - aggregate+=("${l[@]}") - fi - - array_build "$1" "aggregate" -} - download_sources() { local netfile all_sources local get_source_fn=get_all_sources_for_arch get_vcs=1 @@ -2357,21 +2327,6 @@ run_split_packaging() { pkgname=${pkgname_backup[@]} } -print_all_package_names() { - local version=$(get_full_version) - local architecture pkg opts a - for pkg in ${pkgname[@]}; do - get_pkgbuild_attribute "$pkg" 'arch' 1 architecture - get_pkgbuild_attribute "$pkg" 'options' 1 opts - for a in ${architecture[@]}; do - printf "%s-%s-%s\n" "$pkg" "$version" "$a" - if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then - printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" - fi - done - done -} - m4_include(library/parseopts.sh) usage() { |