!squash - re-work special mksource PKGBUILD

1 files changed, 11 insertions, 10 deletions

diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch
index cbd52df..87ad9ef 100755
--- a/src/librefetch/librefetch
+++ b/src/librefetch/librefetch
@@ -333,7 +333,7 @@ readonly PKGBUILD_APPEND='
 ## the modifications below, over-ride the abslibre PKGBUILD above to do mksource magic ##
 
 # ignore split packages - we want a single source-ball
-_is_split_pkg=$( [[ "$(declare -p pkgname 2> /dev/null)" =~ ^"declare -a " ]] && echo 1 || echo 0 )
+_is_split_pkg=$( [[ "$(declare -p pkgname 2> /dev/null)" =~ ^"declare -a " ]] ; echo $((!$?)) )
 if   (( _is_split_pkg ))
 then pkgname=( $( [[ -n "${pkgbase}" ]] && echo ${pkgbase} || echo ${pkgname} ) )
 fi
@@ -349,9 +349,10 @@ noextract=("${mknoextract[@]}")
 
 # replace *sums* arrays with mksource checksums
 declare algo
-for algo in "${known_hash_algos[@]}"; do
-  eval "${algo}sums=(\"\${mk${algo}sums[@]}\")"
-  unset "${algo}sums_${CARCH}"
+for algo in ${known_hash_algos[*]}
+do  eval "[[ -n \"\${mk${algo}sums[*]}\" ]]  &&  \
+          ${algo}sums=(\${mk${algo}sums[*]}) || :"
+    unset "${algo}sums_${CARCH}"
 done
 
 # cleanup any remaining, possibly conflicting data
@@ -362,12 +363,12 @@ options=(!strip docs libtool staticlibs emptydirs !zipman !debug purge)
 PURGE_TARGETS=(.bzr/ .cvs/ .git/ .hg/ .svn/ .makepkg/)
 
 # over-ride build/packaging functions to do mksource magic
-_has_mksource=$( declare -f mksource > /dev/null && echo 1 || echo 0 )
-prepare()    { : ;                                                               }
-build()      { msg "Starting mksource()" ; (( has_mksource )) && mksource || : ; }
-check()      { : ;                                                               }
-package()    { cp -a "$srcdir"/*/ "$pkgdir/" ;                                   }
-(( _is_split_pkg )) && for pkg in ${pkgname[*]} ; do unset package_${pkg} ; done ;
+_has_mksource=$( declare -f mksource > /dev/null ; echo $((!$?)) )
+prepare() { : ;                                                               }
+build()   { msg "Starting mksource()" ; (( has_mksource )) && mksource || : ; }
+check()   { : ;                                                               }
+package() { cp -a "$srcdir"/*/ "$pkgdir/" ;                                   }
+(( ! _is_split_pkg )) || for pkg in ${pkgname[*]} ; do unset package_${pkg} ; done ;
 '
 
 modified_pkgbuild() {