diff --git a/.github/workflows/debuild.yml b/.github/workflows/debuild.yml index 14790847..f401736c 100644 --- a/.github/workflows/debuild.yml +++ b/.github/workflows/debuild.yml @@ -34,6 +34,8 @@ jobs: gpg --keyserver $KEYSERVER --recv-key $CLOUD_KEY_ID sudo -E gpg -v --output "$KEYFILE" --export $CLOUD_KEY_ID sudo apt-get update + - name: update repo information + run: sudo apt-get update - name: install devscripts run: sudo apt-get install equivs devscripts pipx hub - name: install dependencies @@ -90,6 +92,8 @@ jobs: env: PBRT: /var/cache/pbuilder steps: + - name: update repo information + run: sudo apt-get update - name: install pbuilder run: | sudo apt-get install pbuilder qemu-user-static \ diff --git a/debian/rules b/debian/rules index ae971152..588e4dc3 100755 --- a/debian/rules +++ b/debian/rules @@ -29,10 +29,10 @@ override_dh_auto_test: ; endif execute_after_dh_auto_build: - pandoc -o vzlogger.1 -s -t man debian/vzlogger.1.md + pandoc -o vzlogger.8 -s -t man debian/vzlogger.8.md execute_after_dh_clean: - rm -f vzlogger.1 + rm -f vzlogger.8 %: dh $@ diff --git a/debian/vzlogger.1.md b/debian/vzlogger.8.md similarity index 93% rename from debian/vzlogger.1.md rename to debian/vzlogger.8.md index e9634525..4daf7762 100644 --- a/debian/vzlogger.1.md +++ b/debian/vzlogger.8.md @@ -1,3 +1,6 @@ +% VZLOGGER(8) Volkszaehler project | System management commands +% Joachim Zobel + # NAME vzlogger -- A tool to read and log measurements of a wide variety of smart meters and sensors diff --git a/debian/vzlogger.manpages b/debian/vzlogger.manpages index de642587..8e2cd876 100644 --- a/debian/vzlogger.manpages +++ b/debian/vzlogger.manpages @@ -1 +1 @@ -vzlogger.1 +vzlogger.8 diff --git a/debian/vzlogger.postinst b/debian/vzlogger.postinst old mode 100644 new mode 100755 index 2b8da16b..d940740f --- a/debian/vzlogger.postinst +++ b/debian/vzlogger.postinst @@ -1,25 +1,30 @@ #!/bin/sh -e +set -e + case "$1" in configure) - if ! id vzlogger > /dev/null 2>&1 ; then - adduser --system --no-create-home --home /nonexistent \ - --group --disabled-password --shell /bin/false \ - vzlogger - usermod -a -G dialout vzlogger - fi - - touch /var/log/vzlogger.log - chown vzlogger:adm /var/log/vzlogger.log + if ! id vzlogger > /dev/null 2>&1 ; then + adduser --quiet --system --no-create-home --home /nonexistent \ + --group --disabled-password --shell /bin/false \ + vzlogger + usermod -a -G dialout vzlogger + fi + + touch /var/log/vzlogger.log + chown vzlogger:adm /var/log/vzlogger.log ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) - echo "$0 called with unknown argument \`$1'" >&2 - exit 1 + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 ;; esac #DEBHELPER# + +exit 0 + diff --git a/debian/vzlogger.postrm b/debian/vzlogger.postrm new file mode 100755 index 00000000..6e04ca87 --- /dev/null +++ b/debian/vzlogger.postrm @@ -0,0 +1,27 @@ +#!/bin/sh -e + +set -e + +case "$1" in + purge) + rm -f /var/log/vzlogger.log* + deluser --quiet --system vzlogger + delgroup --quiet --system vzlogger + ;; + + remove|abort-install|abort-upgrade|disappear) + ;; + + upgrade|failed-upgrade) + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 +