Changeset 27d5cd1

Timestamp:

Aug 14, 2010, 6:26:35 PM (14 years ago)

Author:

Kyle Brogle <broglek@…>

Branches:

debian

Children:

5aace3f

Parents:

c95ca32

git-author:

Kyle Brogle <broglek@…> (08/14/10 18:26:35)

git-committer:

Kyle Brogle <broglek@…> (08/14/10 18:26:35)

Message:

Fixed error in postrm when purging [tried to rm a folder without -r]

Fixed bug in init where it would try to kill a pid that didn't exist
when restarted

Location:

debian

Files:

• gutenbach-remctl.init (modified) (3 diffs)
• gutenbach-remctl.postrm (modified) (1 diff)
• po/templates.pot (modified) (2 diffs)

debian/gutenbach-remctl.init

@@ -12 +12 @@
 case "$1" in
     start)
-        if [ -e /var/run/gutenbach/remctld.pid ]; then
-            pid=$(cat /var/run/gutenbach/remctld.pid)
-            if [ -n "$pid" ]; then
-                kill -0 "$pid"
-                if [ "$?" == 0 ]; then
-                    echo "Ending remctld..." >&2
-                    kill "$pid" || true
-                fi
-            fi
-        fi
+        
 
         pid=$(sudo lsof -i :4373 | grep remctld | sed s/remctld\ // | sed s/\ .*//)
@@ -37 +28 @@
 
     stop)
-        if [ -e /var/run/gutenbach/remctld.pid ]; then
-            pid=$(cat /var/run/gutenbach/remctld.pid)
-            if [ -n "$pid" ]; then
-                kill -0 "$pid"
-                if [ "$?" == 0 ]; then
-                    echo "Ending remctld..." >&2
-                    kill "$pid" || true
-                fi
-            fi
-        fi
+        
 
         pid=$(sudo lsof -i :4373 | grep remctld | sed s/remctld\ // | sed s/\ .*//)
@@ -59 +41 @@
 
     restart)
-        if [ -e /var/run/gutenbach/remctld.pid ]; then
-            pid=$(cat /var/run/gutenbach/remctld.pid)
-            if [ -n "$pid" ]; then
-                kill -0 "$pid"
-                if [ "$?" == 0 ]; then
-                    echo "Ending remctld..." >&2
-                    kill "$pid" || true
-                fi
-            fi
-        fi
 
         pid=$(sudo lsof -i :4373 | grep remctld | sed s/remctld\ // | sed s/\ .*//)

debian/gutenbach-remctl.postrm

@@ -30 +30 @@
             if [ -e /etc/remctl/conf.d ]; then
                 echo "Removing /etc/remctl/conf.d ..." >&2
-                rm /etc/remctl/conf.d
-                mkdir /etc/remctl/conf.d
+                rm -r  /etc/remctl/conf.d
+                mkdir  /etc/remctl/conf.d
             fi
         fi

debian/po/templates.pot

@@ -1 @@
-# GUTENBACH TRANSLATION FILE.
-# Copyright 2010
-# This file is distributed under the same license as the gutenbach-server package.
-# Jessica B. Hamrick <jhamrick@mit.edu>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.12\n"
-"Report-Msgid-Bugs-To: gutenbach@mit.edu\n"
-"POT-Creation-Date: 2010-08-14 16:11-0400\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: gutenbach@packages.debian.org\n"
+"POT-Creation-Date: 2010-08-14 17:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -29 +29 @@
 "gutenbach creates a printer to which you can print music files.  gutenbach "
 "needs to know what you want to call the  printer, and then after "
-"installation, you will be able to do: lpr -Pprintername@hostname your-music-"
-"file-.mp3"
+"installation, you will be able to use scripts in the gutenbach-client "
+"package or lpr to interact with the server."
 msgstr ""