Changeset 2babe17

Timestamp:

Sep 13, 2009, 1:46:30 AM (15 years ago)

Author:

Jessica Hamrick <jhamrick@…>

Branches:

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

Children:

6710358

Parents:

1bdadfb

git-author:

Jessica Hamrick <jhamrick@…> (09/13/09 01:46:30)

git-committer:

Jessica Hamrick <jhamrick@…> (09/13/09 01:46:30)

Message:

Installing the debian package should make the printing of music files
to the lprmp3 printer work. Still need to add in support for uninstalling
the package and using debconf (so users can add in their own configuration)

Location:

debian

Files:

• inst/edit-lpd.conf (modified) (1 diff)
• inst/edit-lpd.perms (modified) (1 diff)
• inst/edit-printcap (modified) (1 diff)
• inst/run-checkpc (modified) (1 diff)
• lib/sipbmp3-filter (modified) (1 diff)
• sipbmp3-filter-config.pl (modified) (1 diff)
• sipbmp3.init (modified) (1 diff)
• sipbmp3.postinst (modified) (1 diff)

debian/inst/edit-lpd.conf

@@ -12 +12 @@
             printcap=$(echo "$line" | grep /etc/printcap)
             if [ ! -n "$lprngprintcap" ] && [ ! -n "$printcap" ]; then
-                echo "Found line, missing correct entry, adding it..."
                 echo "#$line" >> /etc/lprng/lpd.conf
                 echo "$line" | sed 's,printcap_path=,printcap_path=/etc/lprng/printcap:\|,' >> /etc/lprng/lpd.conf

debian/inst/edit-lpd.perms

@@ -12 +12 @@
         reject_not_server=$(echo "$line" | grep '^REJECT NOT SERVER')
         if [ -n "$reject_not_server" ]; then
-            echo "Found REJECT NOT SERVER, commenting it out..."
             echo "#$line" >> /etc/lprng/lpd.perms
         else
             reject_service=$(echo "$line" | grep '^REJECT SERVICE=M')
             if [ -n "$reject_service" ]; then
-                echo "Found REJECT SERVICE=M, commenting it out..."
                 echo "#line" >> /etc/lprng/lpd.perms
             else

debian/inst/edit-printcap

@@ -2 +2 @@
 
 if [ ! -e /etc/printcap ]; then
-    echo "/etc/printcap does not exist, creating it..."
     touch /etc/printcap
 fi
 
 if [ ! -e /etc/lprng/printcap ]; then
-    echo "/etc/lprng/printcap does not exist, creating it..."
     ln -s /etc/printcap /etc/lprng/printcap
 fi
 
-printcap=$(cat /etc/printcap | grep '^sipbmp3')
+printcap=$(cat /etc/printcap | grep '^lprmp3')
 if [ ! -n "$printcap" ]; then
     # add the appropriate entry into /etc/printcap, /etc/lprng/printcap
-    echo "No entry for sipbmp3, adding one..."
-    echo "sipbmp3" >> /etc/printcap
+    echo "lprmp3" >> /etc/printcap
     echo "  :server" >> /etc/printcap
-    echo "  :cm=sipbmp3 music spooler" >> /etc/printcap
+    echo "  :cm=lprmp3 music spooler" >> /etc/printcap
     echo "  :lp=/dev/null" >> /etc/printcap
     echo "  :if=|/usr/lib/sipbmp3/sipbmp3-filter" >> /etc/printcap
-    echo "  :sd=/var/spool/lpd/sipbmp3" >> /etc/printcap
+    echo "  :sd=/var/spool/lpd/lprmp3" >> /etc/printcap
     echo "  :ml=0:mx=0:sh:sf" >> /etc/printcap
     echo "  :create_files" >> /etc/printcap

debian/inst/run-checkpc

@@ -12 +12 @@
 chmod og=rwx /var/spool/lpd
 chmod og=rwx /var/spool/lpd/%P
-echo "Running checkpc..."
-/usr/sbin/checkpc -V -f >> /dev/null
+/usr/sbin/checkpc -Plprmp3 -f

debian/lib/sipbmp3-filter

@@ -23 +23 @@
 use IPC::Open2;
 
-my $zephyr_class = "sipb-auto";
-my $host = "zsr";
-my $queue = "sipbmp3";
+my $zephyr_class = "lprmp3";
+my $host = "hostname";
+my $queue = "printername";
 
 # Configuration

debian/sipbmp3-filter-config.pl

@@ -1 @@
-$zephyr_class = "my_auto_class"
+$zephyr_class = "jhamrick-test"
 $host = "hostname"
 $queue = "printername"

debian/sipbmp3.init

@@ -16 +16 @@
     touch /var/run/sipbmp3/status
     chmod 0777 /var/run/sipbmp3/status
+    
+    if [ -x /etc/init.d/lprng ]; then
+        script="lprng"
+    elif [ -x /etc/init.d/debathena-lprng ]; then
+        script="debathena-lprng"
+    else
+        exit 1
+    fi
+
     if which invoke-rc.d >/dev/null 2>&1; then
-        invoke-rc.d lprng start
+        invoke-rc.d "$script" start
     else
-        /etc/init.d/lprng start
+        /etc/init.d/"$script" start
     fi
     ;;
+
   stop)
+    if [ -x /etc/init.d/lprng ]; then
+        script="lprng"
+    elif [ -x /etc/init.d/debathena-lprng ]; then
+        script="debathena-lprng"
+    else
+        exit 1
+    fi
+
     rm -r /var/run/sipbmp3
     if which invoke-rc.d >/dev/null 2>&1; then
-        invoke-rc.d lprng stop
+        invoke-rc.d "$script" stop
     else
-        /etc/init.d/lprng stop
+        /etc/init.d/"$script" stop
     fi
     ;;
+
   restart)
+    if [ -x /etc/init.d/lprng ]; then
+        script="lprng"
+    elif [ -x /etc/init.d/debathena-lprng ]; then
+        script="debathena-lprng"
+    else
+        exit 1
+    fi
+
     rm -r /var/run/sipbmp3
     if which invoke-rc.d >/dev/null 2>&1; then
-        invoke-rc.d lprng stop
+        invoke-rc.d "$script" stop
     else
-        /etc/init.d/lprng stop
+        /etc/init.d/"$script" stop
     fi
+
     mkdir /var/run/sipbmp3
     touch /var/run/sipbmp3/status
     chmod 0777 /var/run/sipbmp3/status
     if which invoke-rc.d >/dev/null 2>&1; then
-        invoke-rc.d lprng start
+        invoke-rc.d "$script" start
     else
-       /etc/init.d/lprng start
+       /etc/init.d/"$script" start
     fi
     ;;
+
   reload|force-reload|status)
     ;;
+
   *)
     echo "Usage: /etc/init.d/sipbmp3 {start|stop|restart}" >&2

debian/sipbmp3.postinst

@@ -29 +29 @@
         /usr/lib/sipbmp3/inst/run-checkpc
         /usr/lib/sipbmp3/inst/edit-lpd.perms
+
+        adduser daemon audio
+        adduser daemon pulse
     ;;