Changeset 4ac44b2

Timestamp:

Jun 24, 2010, 1:48:08 AM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

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

Children:

1e04f22

Parents:

c6f9cbe

git-author:

Jessica B. Hamrick <jhamrick@…> (05/13/10 17:30:51)

git-committer:

Jessica B. Hamrick <jhamrick@…> (06/24/10 01:48:08)

Message:

• More useful things in the README
• Change perms to listen from everywhere
• Conflict with pulseaudio, recommend removing bluez-alsa

Files:

• README (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/inst/cups-set-perms (modified) (2 diffs)
• debian/lib/gutenbach (modified) (2 diffs)
• debian/rm/cups-revert-perms (modified) (1 diff)

README

@@ -23 +23 @@
 Questions or comments should be directed at gutenbach@mit.edu
 
+NOTES:
+
+- If you keep getting zephyrs with the following errors:
+
+      Playback completed with the following errors:
+      bt_audio_service_open: connect() failed: Connection refused (111)
+      bt_audio_service_open: connect() failed: Connection refused (111)
+      bt_audio_service_open: connect() failed: Connection refused (111)
+
+  This is because you have alsa configured for bluetooth, but bluetooth is not
+  enabled.  You should either enable bluetooth, or uninstall the bluez-alsa
+  package.
+
+- To print to a machine without keytabs, you need to do:
+
+     lpr -Pprintername -Hhostname $file
+
+  The old `lpr -Pprintername@hostname $file` syntax will no longer work.
+
 TODO:
 - include mixer and channel in debconf, or even better, move it to
   gutenbach-remctl and implement debconf in that package
+
 - the filter should die and send an error message if it can't find the
   config file, not use defaults
-- this should really not conflict with pulse
+
+- this should really not conflict with pulse (the biggest problem at the moment is that
+  pulse will spew a bunch of errors like "Home directory /var/spool/cups/tmp not ours." I
+  can't figure out how to get rid of them, but they're really annoying.  As long as pulse
+  is in system mode, things seem to work otherwise.)
+
 - finish the move to CUPS!
     * the CUPS daemon processes do not inherit groups from the lp user (so, for example,

debian/control

@@ -11 +11 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, libimage-exiftool-perl, lprng | debathena-lprng, sysv-rc, adduser, debathena-zephyr-config, libzephyr3-krb, alsa-base
 Conflicts: pulseaudio
+Provides: pulseaudio
 Description: Server for playing music files from a remote machine
  Allows remote machines to play music files on this machine

debian/inst/cups-set-perms

@@ -7 +7 @@
     printername="$(cat /usr/lib/gutenbach/config/printername)"
 
-    cat >> /etc/cups/cupsd.conf <<EOF
+    conffile="/etc/cups/cupsd.conf"
+    mv "$conffile" "$conffile.bak"
+    touch "$conffile"
+
+    while read line; do
+        listen_localhost=$(echo "$line" | grep '^Listen localhost' || true)
+        if [ -n "$listen_localhost" ]; then
+            echo "#GUTENBACH$line" >> "$conffile"
+        else
+            echo "$line" >> "$conffile"
+        fi
+    done < "$conffile.bak"
+    rm "$conffile.bak"
+
+    cat >> "$conffile" <<EOF
 # Begin configurations for gutenbach
 
@@ -16 +30 @@
 
 Group audio
+Listen *
 
 # End configurations for gutenbach

debian/lib/gutenbach

@@ -299 +299 @@
   if ($pid) { #parent
     # Check if there were any errors
+    
     if ($_ = <MP3STATUS>) {
       print ZEPHYR "Playback completed with the following errors:\n";
-      print ZEPHYR $_;
       while (<MP3STATUS>) {
         print ZEPHYR $_;
@@ -319 +319 @@
     open(STDIN, "/dev/null");
 
-    my @args = (qw|/usr/bin/mplayer -vo fbdev2 -zoom -x 1024 -y 768 -framedrop -nolirc -ao alsa -cache 512 -really-quiet |, $filepath);
+    my @args = (qw|/usr/bin/mplayer -vo fbdev2 -zoom -x 1024 -y 768 -framedrop -nolirc -cache 512 -ao alsa -really-quiet |, $filepath);
     #print STDERR "About to exec: ", Dumper([@args]);
     exec(@args) ||

debian/rm/cups-revert-perms

@@ -2 +2 @@
 
 echo "Reverting changes to /etc/cups/cupsd.conf..." >&2
-mv /etc/cups/cupsd.conf /etc/cups/cupsd.conf.bak
-touch /etc/cups/cupsd.conf
+conffile="/etc/cups/cupsd.conf"
 
-sed '/# Begin configurations for gutenbach/,/# End configurations for gutenbach/ d' < /etc/cups/cupsd.conf.bak > /etc/cups/cupsd.conf
+mv "$conffile" "$conffile.bak"
+touch "$conffile"
+sed '/# Begin configurations for gutenbach/,/# End configurations for gutenbach/ d' < "$conffile.bak" > "$conffile"
 
-rm /etc/cups/cupsd.conf.bak
+mv "$conffile" "$conffile.bak"
+touch "$conffile"
+while read line; do
+    listen_localhost=$(echo "$line" | grep '^#GUTENBACH' || true)
+    if [ -n "$listen_localhost" ]; then
+        echo "$(echo $line | sed s/#GUTENBACH//)" >> "$conffile"
+    else
+        echo "$line" >> "$conffile"
+    fi
+done < "$conffile.bak"
+
+rm "$conffile.bak"