From c64c8ddcdfcce76f41f7c37cccec8d4894ade2c1 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Mon, 19 Jul 2021 17:06:47 -0400 Subject: wip meld-src-pkgbuilds --- src/maintenance-tools/meld-src-pkgbuilds | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/maintenance-tools/meld-src-pkgbuilds b/src/maintenance-tools/meld-src-pkgbuilds index df08c9f..5121236 100755 --- a/src/maintenance-tools/meld-src-pkgbuilds +++ b/src/maintenance-tools/meld-src-pkgbuilds @@ -5,11 +5,8 @@ readonly PKGS_DIR="$(source /etc/libretools.conf ; echo "${WORKDIR}" ;)" - - -# readonly PKGS_DIR="$(source "$(grep 'WORKDIR=' /etc/libretools.conf)" ; echo "${WORKDIR}")" -echo "PKGS_DIR=${PKGS_DIR:-/packages}" - +readonly ABS_DIR=${PKGS_DIR}/arch +readonly ABSLIBRE_DIR=${PKGS_DIR}/abslibre [[ ! -d "${PKGS_DIR:-/packages}" ]] && echo "no such dir" && exit 1 @@ -81,6 +78,8 @@ GitPkgbuilds() local abs_dir="$( head -n 1 <<<${abs_dirs} )" local is_writable=$(touch ${abs_dir}/PKGBUILD &> /dev/null ; echo $(( ! $? )) ; ) +echo -e "GitPkgbuilds() OUT\n arch_dirs=$arch_dir\n abs_dirs=$abs_dirs\n arch_dir=$arch_dir\n abs_dir=$abs_dir\n is_writable=$is_writable" >&2 + [[ -z "$arch_dir" ]] && echo "no such arch PKGBUILD" >&2 && return 1 [[ -z "$abs_dir" ]] && echo "no such parabola PKGBUILD" >&2 && return 1 @@ -116,14 +115,14 @@ echo "DoDiff() pkgbuild_a=$pkgbuild_a pkgbuild_b=$pkgbuild_b" if (( UseGui )) then echo "launching meld" meld "${pkgbuild_a}" "${pkgbuild_b}" - else diff -u -r "${pkgbuild_a}" "${pkgbuild_b}" | sed -E "${sed_rx}" | tee ${patch_file} + else diff -u -r "${pkgbuild_a}" "${pkgbuild_b}" | sed -E "${sed_rx}" | tee ${patch_file} >&2 fi fi } main() { -echo -e "meld-src-pkgbuilds() IN\n n_args$#\n 1=$1\n 2=$2\n GitPkgbuilds='$(GitPkgbuilds "$1")'" ; # $# $@" >&2 ; local in=$# ; +echo -e "meld-src-pkgbuilds() IN\n n_args$#\n 1=$1\n 2=$2\n GitPkgbuilds='$(GitPkgbuilds "$1")'" ; # $# $@" >&2 ; local in=$# ; local pkgname_rx='^[0-9a-z][0-9a-zA-Z_-]*$' local is_pkg_name=$( [[ "$1" =~ ${pkgname_rx} ]] ; echo $(( ! $? )) ) @@ -139,14 +138,13 @@ echo -e "meld-src-pkgbuilds() IN\n n_args$#\n 1=$1\n 2=$2\n GitPkgbuilds='$(G then srcpkgs=( "$(GitPkgbuilds "$1")" ) srcpkg_a=${srcpkgs[0]} srcpkg_b=${srcpkgs[1]} - else srcpkg_a="$( SelectSrcpkg "$1" || GitPkgbuilds "$1" )" - srcpkg_b="$( SelectSrcpkg "$1" || GitPkgbuilds "$1" )" + else srcpkg_a="$( SelectSrcpkg "$1" || GitPkgbuilds "$1" )" ; is_src_pkg_a=1 ; + srcpkg_b="$( SelectSrcpkg "$1" || GitPkgbuilds "$1" )" ; is_src_pkg_b=1 ; fi else (( is_src_pkg_a && is_src_pkg_b )) && srcpkg_a="$1" srcpkg_b="$2" (( is_pkgbuild_a && is_pkgbuild_b )) && srcpkg_a="$1" srcpkg_b="$2" fi -# local are_src_pkgs=$( echo $(( is_src_pkg_a && is_src_pkg_b )) ) local are_src_pkgs=$( (( is_src_pkg_a && is_src_pkg_b )) ; echo $(( ! $? )) ) local are_abs_dirs=$( (( UseAbs )) && [[ -d "${srcpkg_a}" && \ -d "${srcpkg_b}" ]] ; echo $(( ! $? )) ) @@ -169,6 +167,7 @@ echo -e "meld-src-pkgbuilds()\n pkgbuild_a=${pkgbuild_a}\n pkgbuild_b=${pkgbui tar -zxf "${srcpkg_a}" "${pkgbuild_a}" > ./srcpkgbuild_a tar -zxf "${srcpkg_b}" "${pkgbuild_b}" > ./srcpkgbuild_b DoDiff ./srcpkgbuild_a ./srcpkgbuild_b "${srcpkg_a}" "${srcpkg_b}" + rm ./srcpkgbuild_a ./srcpkgbuild_b fi elif (( are_abs_dirs )) -- cgit v1.2.2