Update build system files

4 files changed, 6 insertions, 13 deletions

diff --git a/autodeps.sh b/autodeps.sh
index 3402c96b4..6347d4bf1 100644
--- a/autodeps.sh
+++ b/autodeps.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 export PATH=${PKG_BASE}/util:$PATH
-DEPSDIR="${PKG_STAT}"/deps
-if [ ! -d "${DEPSDIR}" ]; then
-    mkdir "${DEPSDIR}"
-fi
-rm -f "${PKG_STAT}"/dest-deps || true
 declare -a PKG_DPKG_DEPS
 declare -a PKG_MISSING_DEPS
 for dep in "${PKG_DEPS[@]}"; do
@@ -27,7 +22,7 @@ declare -a deps
 deps=($(find -L "${PKG_DATA}"/_metadata -name '*.dep' | sed -e 's/^.*\///' -e 's/\.dep$//' | sort -u))
 
 #echo Current Depends: $(IFS=','; echo "${PKG_DPKG_DEPS[*]}" | sed -e 's/,/, /g')
-for bin in $(find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0); do
+for bin in $(find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \)); do
     case "$(file "${bin}")" in (\
             *': Mach-O fat file with '*([0-9])' architecture' |\
             *': '*(setuid |setgid )'Mach-O 64-bit executable arm64' |\
diff --git a/control.sh b/control.sh
index bc88ef2b1..37154da45 100755
--- a/control.sh
+++ b/control.sh
@@ -124,7 +124,7 @@ if [[ ! -e ${PKG_DATA}/_metadata/depends_ ]]; then
             comma=
         fi
 
-        echo -n " $(cat "${PKG_DATA}/_metadata/depends" | sed -e s/%MYVERSION%/${PKG_VRSN%-*}/)"
+        echo -n " $(cat "${PKG_DATA}/_metadata/depends" | sed -e s/%MYVERSION%/${PKG_VRSN%-*}/g)"
     fi
 
     if [[ ${comma+@} == @ ]]; then
diff --git a/exec.sh b/exec.sh
index 3422a63fe..8cfab11d7 100755
--- a/exec.sh
+++ b/exec.sh
@@ -23,11 +23,9 @@ if [[ -n ${FAKEROOTKEY} ]]; then
 fi
 
 case "${PKG_NAME}" in
-    (-) deps=();;
-    (:*) deps=(${PKG_NAME//:/ });;
-    (*) deps=($({
-        find -L "${PKG_DATA}"/_metadata -name '*.dep' -exec basename {} .dep \;
-    } | sort -u));;
+    (-) deps=() ;;
+    (:*) deps=(${PKG_NAME//:/ }) ;;
+    (*) deps=($(find -L "${PKG_DATA}"/_metadata -name '*.dep' | sed -e 's/^.*\///' -e 's/\.dep$//' | sort -u)) ;;
 esac
 
 for dep in ${deps[@]}; do
diff --git a/make.sh b/make.sh
index bbd67bf3f..07d2bed4d 100755
--- a/make.sh
+++ b/make.sh
@@ -222,7 +222,7 @@ find "${PKG_DEST}" -type f -name '*.a' -print0 | while read -r -d $'\0' bin; do
     "${PKG_BASE}/util/arid" "${bin}"
 done
 
-if [[ -f "${PKG_STAT}/data-ver" ]] && dpkg --compare-versions $(cat "${PKG_DATA}/_metadata/version") gt $(cat "${PKG_STAT}/data-ver"); then
+if [[ -f "${PKG_STAT}/data-ver" && -f "${PKG_STAT}/dest-ver" ]] && dpkg --compare-versions $(cat "${PKG_DATA}/_metadata/version") gt $(cat "${PKG_STAT}/data-ver"); then
     rm "${PKG_STAT}/dest-ver"
 fi
 cp -aL "${PKG_DATA}/_metadata/version" "${PKG_STAT}/data-ver"