Changeset 331360d

Timestamp:

Sep 17, 2009, 2:55:47 AM (15 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups, nodebathena, web

Children:

c631d1a

Parents:

c061ab8

git-author:

Jessica B. Hamrick <jhamrick@…> (09/17/09 02:55:47)

git-committer:

Jessica B. Hamrick <jhamrick@…> (09/17/09 02:55:47)

Message:

Added debconf implementation and clean uninstall, but the actual functionality of sipbmp3 seems to be broken - it will send a zephyr and say it's playing the song, and then say "playback completed sucessfully", but both zephyrs come at the ~same time and there is no sound output.

Location:

sipbmp3/debian

Files:

• changelog (modified) (1 diff)
• control.in (modified) (1 diff)
• inst/create-filter-config (added)
• inst/edit-lpd.conf (modified) (3 diffs)
• inst/edit-lpd.perms (modified) (2 diffs)
• inst/edit-printcap (modified) (2 diffs)
• inst/run-checkpc (modified) (2 diffs)
• lib/sipbmp3-filter (modified) (1 diff)
• po/POTFILES.in (added)
• po/templates.pot (added)
• rm/revert_lpd.conf (added)
• rm/revert_lpd.perms (added)
• rm/revert_printcap (added)
• sipbmp3-filter-config.pl (deleted)
• sipbmp3.config (added)
• sipbmp3.dirs (modified) (1 diff)
• sipbmp3.install (modified) (1 diff)
• sipbmp3.postinst (modified) (2 diffs)
• sipbmp3.postrm (added)
• sipbmp3.preinst (added)
• sipbmp3.prerm (added)
• sipbmp3.templates (added)

sipbmp3/debian/changelog

@@ +1 @@
+sipbmp3 (1.1) unstable; urgency=low
+
+  * Implemented debconf to retrieve printer and zephyr class names.
+  * Made uninstall cleaner (and when you purge, it purges
+  configuration files and changes)
+
+ -- Jessica Hamrick <jhamrick@mit.edu>  Wed, 16 Sep 2009 15:58:40 -0400
+
 sipbmp3 (1.0) unstable; urgency=low
 

sipbmp3/debian/control.in

@@ -8 +8 @@
 Package: sipbmp3
 Architecture: all
+Pre-Depends: debconf
 Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, libimage-exiftool-perl, lprng | debathena-lprng, sysv-rc, adduser, debathena-zephyr-config, libzephyr3-krb, alsa-base
 Conflicts: pulseaudio

sipbmp3/debian/inst/edit-lpd.conf

@@ -1 @@
-#!/bin/sh
+#!/bin/sh -e
 
+echo "Editing /etc/lprng/lpd.conf..." >&2
 # add the printcap path to lpd.conf
 if [ -e /etc/lprng/lpd.conf ]; then
@@ -7 +8 @@
 
     while read line; do
-        printcap=$(echo "$line" | grep ^printcap_path=)
+        printcap=$(echo "$line" | grep ^printcap_path= || true)
         if [ -n "$printcap" ]; then
-            lprngprintcap=$(echo "$line" | grep /etc/lprng/printcap)
-            printcap=$(echo "$line" | grep /etc/printcap)
+            lprngprintcap=$(echo "$line" | grep /etc/lprng/printcap || tre)
+            printcap=$(echo "$line" | grep /etc/printcap || true)
             if [ ! -n "$lprngprintcap" ] && [ ! -n "$printcap" ]; then
                 echo "#$line" >> /etc/lprng/lpd.conf
@@ -28 +29 @@
 
 # add lpd_listen_port to lpd.conf
-lpd_listen_port=$(cat /etc/lprng/lpd.conf | grep ^lpd_listen_port=515)
+lpd_listen_port=$(cat /etc/lprng/lpd.conf | grep ^lpd_listen_port=515 || true)
 if [ ! -n "$lpd_listen_port" ]; then
     echo "lpd_listen_port=515" >> /etc/lprng/lpd.conf

sipbmp3/debian/inst/edit-lpd.perms

@@ -5 +5 @@
 # allow other users to dequeue music
 # (comment out REJECT SERVICE=M
+echo "Editing /etc/lprng/lpd.perms..." >&2
 if [ -e /etc/lprng/lpd.perms ]; then
     mv /etc/lprng/lpd.perms /etc/lprng/lpd.perms.bak
@@ -10 +11 @@
 
     while read line; do
-        reject_not_server=$(echo "$line" | grep '^REJECT NOT SERVER')
+        reject_not_server=$(echo "$line" | grep '^REJECT NOT SERVER' || true)
         if [ -n "$reject_not_server" ]; then
             echo "#$line" >> /etc/lprng/lpd.perms
         else
-            reject_service=$(echo "$line" | grep '^REJECT SERVICE=M')
+            reject_service=$(echo "$line" | grep '^REJECT SERVICE=M' || true)
             if [ -n "$reject_service" ]; then
                 echo "#line" >> /etc/lprng/lpd.perms

sipbmp3/debian/inst/edit-printcap

@@ -1 @@
-#!/bin/sh
+#!/bin/sh -e
 
+echo "Editing /etc/printcap..." >&2
 if [ ! -e /etc/printcap ]; then
     touch /etc/printcap
@@ -9 +10 @@
 fi
 
-printcap=$(cat /etc/printcap | grep '^lprmp3')
+. /usr/share/debconf/confmodule
+db_get sipbmp3/printername
+
+printcap=$(cat /etc/printcap | grep ^`echo $RET` || true)
 if [ ! -n "$printcap" ]; then
     # add the appropriate entry into /etc/printcap, /etc/lprng/printcap
-    echo "lprmp3" >> /etc/printcap
+    echo "$RET" >> /etc/printcap
     echo "  :server" >> /etc/printcap
-    echo "  :cm=lprmp3 music spooler" >> /etc/printcap
+    echo "  :cm=$RET music spooler" >> /etc/printcap
     echo "  :lp=/dev/null" >> /etc/printcap
     echo "  :if=|/usr/lib/sipbmp3/sipbmp3-filter" >> /etc/printcap
-    echo "  :sd=/var/spool/lpd/lprmp3" >> /etc/printcap
+    echo "  :sd=/var/spool/lpd/$RET" >> /etc/printcap
     echo "  :ml=0:mx=0:sh:sf" >> /etc/printcap
     echo "  :create_files" >> /etc/printcap

sipbmp3/debian/inst/run-checkpc

@@ -1 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # make sure directories exist for checkpc
+echo "Running checkpc..." >&2
 if [ ! -d /var/spool/lpd ]; then
     mkdir /var/spool/lpd
@@ -12 +13 @@
 chmod og=rwx /var/spool/lpd
 chmod og=rwx /var/spool/lpd/%P
-/usr/sbin/checkpc -Plprmp3 -f
+
+. /usr/share/debconf/confmodule
+db_get sipbmp3/printername
+/usr/sbin/checkpc -P"$RET" -f

sipbmp3/debian/lib/sipbmp3-filter

@@ -28 +28 @@
 
 # Configuration
-my $config_file = "/etc/sipbmp3-filter-config.pl";
+my $config_file = "/usr/lib/sipbmp3/config/sipbmp3-filter-config.pl";
 if (-r $config_file) {
     # Inline the configuration file

sipbmp3/debian/sipbmp3.dirs

@@ -1 +1 @@
 usr/lib/sipbmp3
 usr/lib/sipbmp3/inst
+usr/lib/sipbmp3/rm
 etc/

sipbmp3/debian/sipbmp3.install

@@ -1 +1 @@
 debian/lib/* /usr/lib/sipbmp3/
 debian/inst/* /usr/lib/sipbmp3/inst/
-debian/sipbmp3-filter-config.pl /etc/
+debian/rm/* /usr/lib/sipbmp3/rm/

sipbmp3/debian/sipbmp3.postinst

@@ -18 +18 @@
 # the debian-policy package
 
+. /usr/share/debconf/confmodule
 
 case "$1" in
-    configure)
+    configure|reconfigure)
+        chmod +x /usr/lib/sipbmp3/inst/create-filter-config
         chmod +x /usr/lib/sipbmp3/inst/edit-printcap
         chmod +x /usr/lib/sipbmp3/inst/edit-lpd.conf
         chmod +x /usr/lib/sipbmp3/inst/run-checkpc
         chmod +x /usr/lib/sipbmp3/inst/edit-lpd.perms
+        /usr/lib/sipbmp3/inst/create-filter-config
         /usr/lib/sipbmp3/inst/edit-printcap
         /usr/lib/sipbmp3/inst/edit-lpd.conf
@@ -30 +33 @@
         /usr/lib/sipbmp3/inst/edit-lpd.perms
 
-        adduser daemon audio
+        if [ -e /usr/lib/sipbmp3/config/printer_name ]; then
+            rm /usr/lib/sipbmp3/config/printer_name
+        fi
+
+        if [ -e /usr/lib/sipbmp3/config/zephyr_class ]; then
+            rm /usr/lib/sipbmp3/config/zephyr_class
+        fi
+
+        inaudio=$(groups daemon | grep audio || true)
+        if [ -z "$inaudio" ]; then
+            adduser daemon audio
+        fi
+
+        db_stop
     ;;