From 609c123ace93fcfd9d068dad691003e7590ad839 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 26 Nov 2022 00:36:04 -0500 Subject: fix; update for bullseye --- selfpublish.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/selfpublish.sh b/selfpublish.sh index 1d97356..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() @@ -539,7 +541,7 @@ 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 @@ -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" -- cgit v1.2.3