1 files changed, 12 insertions, 10 deletions

diff --git a/selfpublish.sh b/selfpublish.sh
index 6ab7374..072ee6e 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -83,10 +83,12 @@ dpkg_install()
             apt-cache policy | grep -q 'http://httpredir.debian.org/debian buster-backports/main' ||
                 write_line_once /etc/apt/sources.list.d/buster-backports.list \
                     'deb      http://httpredir.debian.org/debian  buster-backports  main'
+            as_root $SHELL -c "set -$- +e; dpkg -i $*; apt-get -t buster-backports -f install"
+            ;;
+        *)
+            as_root $SHELL -c "set -$- +e; dpkg -i $*; apt-get -f install"
             ;;
     esac
-
-    as_root $SHELL -c "set -$- +e; dpkg -i $*; apt-get -t buster-backports -f install"
 }
 
 fmt_dependencies()
@@ -149,7 +151,7 @@ control_file_file_check()
                     if ! diff -q "$2" "$tempout"
                     then
                         RESULT=1
-                        install -v -m "$3" "$tempout" -T "$2"
+                        as_root install -v -m "$3" "$tempout" -T "$2"
                     fi
                     header=$data
                     continue 2
@@ -539,13 +541,13 @@ equivocate()
         cd "$destdir"
         control_file > ./control
         equivs-build ./control >&2
-        DEB=${SELF_PACKAGE}_${SELF_VERSION}_all.deb
+        DEB=../${SELF_PACKAGE}_${SELF_VERSION}_all.deb
 
         if ! [ "$NO_APT" ]
         then
             as_root dpkg -r "${SELF_PACKAGE}"
             dpkg_install "$DEB"
-            install -m0644 "$DEB" "$DEBDEST"
+            as_root install -m0644 "$DEB" "$DEBDEST"
         fi
     ) || exit
 }
@@ -613,7 +615,7 @@ enable_apache_modules()
         done
         if [ "$restart" ]
         then
-                systemctl restart apache2
+                as_root systemctl restart apache2
         fi
 }
 
@@ -740,7 +742,7 @@ install_self_to_site()
                 cp -Tuv "$src" "$dst" >&2
                 cp -Tuv "$src" "$dst".txt >&2
         fi
-        DEB="${SELF_PACKAGE}_${SELF_VERSION}_all.deb"
+        DEB=${SELF_PACKAGE}_${SELF_VERSION}_all.deb
         if [ -e "$DEB" ]
         then
             cp -Tuv "$DEB" "$SITE_DIR/public_html/$DEB"
@@ -968,11 +970,11 @@ configure_apache_vhost
 
 if [ $tls_result != 0 ] || force
 then
-        systemctl restart apache2
+        as_root systemctl restart apache2
         wait_for_certificate_issuance "$DOMAIN"
-        systemctl reload apache2 || systemctl restart apache2
+        as_root systemctl reload apache2 || as_root systemctl restart apache2
 else
-        systemctl reload apache2 || systemctl restart apache2
+        as_root systemctl reload apache2 || as_root systemctl restart apache2
 fi
 
 check_tls "$DOMAIN"