update for build system

Author: hastmu

.include.build.deb.sh

@@ -9,7 +9,7 @@ DEBIAN["Section"]="base"
 DEBIAN["Priority"]="optional"
 DEBIAN["Architecture"]="all"
 DEBIAN["Depends"]="coreutils, grep, sed, wget, avahi-utils"
-DEBIAN["Conflict"]="squid-deb-proxy-client"
+DEBIAN["Conflict"]="squid-deb-proxy-client, auto-apt-proxy"
 DEBIAN["Maintainer"]="[email protected]"
 DEBIAN["Description"]="apt proxy detection"
 

deploy-deb.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 echo "- deploying..."
+source .include.common.sh
 
 (
    cd "$(dirname "$0")"
@@ -42,8 +43,16 @@ echo "- deploying..."
          continue
       fi
 
+      branch_name="${branch#*/}" ; branch_name=${branch_name//\//-}
       branch_tag=${tag_hash[${branch_hash}]:="none"}
-      echo "${branch_type} - ${branch_hash} - ${branch} - TAG[${branch_tag}]"
+      if [ "${branch_tag}" == "none" ]
+      then
+         branch_version="0.0.0"
+         branch_tag="${branch_hash:0:7}-$(date +%s)"
+      else
+         branch_version="${branch_tag//v/}"
+      fi
+      echo "${branch_type} - ${branch_hash} - ${branch_name} - TAG[${branch_tag}] - VERSION[${branch_version}]"
 
       DPKG_BUILD_ROOT="${T_DIR}/.dpkg-root/${branch_hash}"
       mkdir -p "${DPKG_BUILD_ROOT}"
@@ -57,6 +66,30 @@ echo "- deploying..."
             gen_control_file
             gen_rootfs
             find "${DPKG_BUILD_ROOT}"
+            deb_name="${DEBIAN["Package"]}-${DEBIAN["Version"]}_${DEBIAN["Architecture"]}.deb"
+            if dpkg -b "${DPKG_BUILD_ROOT}" "${T_DIR}/.dpkg-root/${deb_name}"
+            then
+               ls -al "${T_DIR}/.dpkg-root/${deb_name}"
+               echo "DIST: ${DIST[${branch_type}.pool.${DEBIAN["Architecture"]}]}"
+
+               mv -v "${T_DIR}/.dpkg-root/${deb_name}" \
+                     "${DIST["root"]}/${DIST[${branch_type}.pool.${DEBIAN["Architecture"]}]}/."
+
+               # remove old versions if unstable
+               if [ "${branch_type}" == "unstable" ]
+               then
+                  search_name="${deb_name}"
+#                  echo "${search_name%-*}"
+                  echo "- remove all unstable without latest hash"
+                  # remove all not latest unstable
+                  find "${DIST["root"]}/${DIST[${branch_type}.pool.${DEBIAN["Architecture"]}]}/." -type f ! -name "${search_name%-*}*.deb" -print0 \
+                  | xargs -0 -n1 rm -fv
+                  # only keep oldest with the same hash
+                  echo "- keep oldest with latest hash"
+                  find "${DIST["root"]}/${DIST[${branch_type}.pool.${DEBIAN["Architecture"]}]}/." -type f -name "${DEBIAN["Package"]}*.deb" \
+                  | sort -n | tail -n +2 | xargs -n1 rm -rvf
+               fi
+            fi
          fi
       )