use apt option --mark-auto; also cleanups

1 files changed, 38 insertions, 39 deletions

diff --git a/install-packages.bash b/install-packages.bash
index 61af49e..2cc2e1f 100644
--- a/install-packages.bash
+++ b/install-packages.bash
@@ -15,6 +15,34 @@ media='libdbus-glib-1-2 mpv pulseaudio imagemagick'
 
 apt install -q --show-progress --no-upgrade $basics $docs $xorg $media
 
+all_files_exist()
+{
+    for f in "$@"
+    do
+        [ -e "$f" ] || return
+    done
+    true
+}
+
+# Clone into temporary directory then move to final dest -- to preserve
+# idempotence in case of git failure.
+git_clone()
+{
+    local src dst tmpdst
+    local src="$1"
+    local dst="$(realpath "$2")" || return
+    local tmpdst="$(mktemp -d "$dst"~tmp~XXXXXX)" || return
+
+    if git clone --depth=1 -- "$src" "$tmpdst"
+    then
+        mv -T -- "$tmpdst" "$dst"
+    else
+        r=$?
+        rm -rf -- "$tmpdst"
+        return $r
+    fi
+}
+
 apt_backport()
 {
     (
@@ -33,60 +61,31 @@ apt_backport()
                 cd "$TARGET_PKG"
                 git pull --ff-only
         else
-                rm -rf "$TARGET_PKG"~tmp
-                git clone --depth=1 "$TARGET_URL" "$TARGET_PKG"~tmp
-                mv -T "$TARGET_PKG"~tmp "$TARGET_PKG"
+                git_clone "$TARGET_URL" "$TARGET_PKG"
                 cd "$TARGET_PKG"
         fi
 
         arch=$(dpkg-architecture -q DEB_BUILD_ARCH)
         version=$(dpkg-parsechangelog --show-field Version)
         pkgs=$(dh_listpackages)
+
         debs=
         for pkg in $pkgs
         do
-                debs="$debs ${pkg}_${version}_${arch}.deb"
+                debs="$debs ../${pkg}_${version}_${arch}.deb"
         done
 
-        for deb in $debs
-        do
-                [ -e ../"$deb" ] && continue || true
-                # We are missing a deb, therefore build.
-
-                if command -v mk-build-deps >/dev/null
+        if ! all_files_exist $debs
+        then
+                build_deps=$(get_build_deps)
+                if [ "$build_deps" ]
                 then
-                        mk-build-deps "$TARGET_PKG" --install
-                else
-                        # We could 'apt install devscripts' but it pulls
-                        # in like 50MB of perl deps, possibly nullifying
-                        # the savings from removing unneeded build deps.
-
-                        # However, we cannot simply use 'apt build-dep'
-                        # because that would use the build-deps from the
-                        # version of the package in the repo, which may
-                        # differ from the source version.
-
-                        # Arguably we do want to try that though, since
-                        # it's a backport...
-
-                        if [ "$try_newer_build_deps" ]
-                        then
-                                build_deps=$(get_build_deps)
-                                apt install $build_deps
-                        else
-                                apt build-dep "$TARGET_PKG"
-                        fi
+                        apt install --mark-auto $build_deps
                 fi
                 fakeroot ./debian/rules binary
-                break
-        done
+        fi
 
-        set --
-        for deb in $debs
-        do
-                set -- "$@" ../"$deb"
-        done
-        apt install "$@"
+        apt install $debs
     )
 }