[SCM] live-config branch, debian, updated. debian/2.0_a5-1-15-g7e5167f

Daniel Baumann daniel at debian.org
Tue Jun 8 04:09:07 UTC 2010 

The following commit has been merged in the debian branch:
commit 5c63d3f8a044320f7f4c53751386fdf2e4aae071
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 7 13:46:37 2010 +0200

    Renaming hook script to hooks for consistency.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index a99b788..d4d0a7d 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -86,7 +86,7 @@ gesetzt.
 .IP \fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP 4
 Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert
 gesetzt.
-.IP "\fBlive\-config.hook\fP=\fIURL1\fP|\fIURL2\fP| ...|\fIURLn\fP" 4
+.IP "\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP| ...|\fIURLn\fP" 4
 Ermöglicht eine oder mehrere beliebige Dateien herunterzuladen und
 auszuführen. Die URLs müssen durch wget aufösbar sein und es müssen alle
 Abhängigkeiten, die für das Ausführen der Dateien notwendig sind, bereits
@@ -162,8 +162,8 @@ Diese Variable enspricht dem
 .IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIKEYBOARD_OPTIONS\fP 4
 Diese Variable enspricht dem
 \&'\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP' Parameter.
-.IP "\fBLIVE_HOOK\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
-Diese Variable enspricht dem '\fBlive\-config.hook\fP=\fIURL1\fP|\fIURL2\fP|
+.IP "\fBLIVE_HOOKS\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
+Diese Variable enspricht dem '\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP|
 \&... |\fIURLn\fP' Parameter.
 
 .SH ANPASSUNG
@@ -245,7 +245,7 @@ räumt dem Benutzer Privilegien durch policykit ein.
 erneuert SSL snake\-oil Zertifikate.
 .IP \fBupdate\-notifier\fP 4
 schaltet update\-notifier ab.
-.IP \fBhook\fP 4
+.IP \fBhooks\fP 4
 erlaubt beliebige Kommands von einem Skript auf dem Live Medium oder von
 einem HTTP/FTP Server auszuführen.
 
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 34c2611..d321678 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -52,7 +52,7 @@ Allows to change the keyboard layout. There is no default value set.
 Allows to change the keyboard variant. There is no default value set.
 .IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
 Allows to change the keyboard options. There are no default value set.
-.IP "\fBlive\-config.hook\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
+.IP "\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
 Allows to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget, and that the files needs their dependencies, if any, already installed, e.g. if a python script should be executed the system needs python installed.
 
 .SS Boot Parameters (shortcuts)
@@ -94,8 +94,8 @@ This variable equals the '\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT
 This variable equals the '\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR' parameter.
 .IP "\fBLIVE_KEYBOARD_OPTIONS\fR=\fIKEYBOARD_OPTIONS\fR" 4
 This variable equals the '\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR' parameter.
-.IP "\fBLIVE_HOOK\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
-This variable equals the '\fBlive\-config.hook\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR' parameter.
+.IP "\fBLIVE_HOOKS\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
+This variable equals the '\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR' parameter.
 
 .SH CUSTOMIZATION
 \fBlive\-config\fR can be easily customized for downstream projects or local usage.
@@ -161,7 +161,7 @@ grant user privilegies through policykit.
 regenerating ssl snake\-oil certificates.
 .IP "\fBupdate\-notifier\fR" 4
 disables update\-notifier.
-.IP "\fBhook\fR" 4
+.IP "\fBhooks\fR" 4
 allows to run arbitrary commands from a script placed on the live media or an http/ftp server.
 
 .SH FILES
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 1c3dff5..4292bca 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 2.0~a5\n"
-"POT-Creation-Date: 2010-06-07 11:47+0300\n"
+"POT-Creation-Date: 2010-06-07 13:40+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -327,8 +327,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:55
 #, no-wrap
-msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
-msgstr "B<live-config.hook>=I<URL1>|I<URL2>| ...|I<URLn>"
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ...|I<URLn>"
 
 #. type: Plain text
 #: en/live-config.7:57
@@ -618,16 +618,16 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:97
 #, no-wrap
-msgid "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
-msgstr "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 
 #. type: Plain text
 #: en/live-config.7:99
 msgid ""
-"This variable equals the 'B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>' "
-"parameter."
+"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
+"I<URLn>' parameter."
 msgstr ""
-"Diese Variable enspricht dem 'B<live-config.hook>=I<URL1>|I<URL2>| ... |"
+"Diese Variable enspricht dem 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
 "I<URLn>' Parameter."
 
 #. type: SH
@@ -991,8 +991,8 @@ msgstr "schaltet update-notifier ab."
 #. type: IP
 #: en/live-config.7:164
 #, no-wrap
-msgid "B<hook>"
-msgstr "B<hook>"
+msgid "B<hooks>"
+msgstr "B<hooks>"
 
 #. type: Plain text
 #: en/live-config.7:166
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 5a8c97a..982da85 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-06-07 11:47+0300\n"
+"POT-Creation-Date: 2010-06-07 13:40+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -281,7 +281,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:55
 #, no-wrap
-msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
 msgstr ""
 
 #. type: Plain text
@@ -521,14 +521,14 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:97
 #, no-wrap
-msgid "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:99
 msgid ""
-"This variable equals the 'B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>' "
-"parameter."
+"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
+"I<URLn>' parameter."
 msgstr ""
 
 #. type: SH
@@ -871,7 +871,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:164
 #, no-wrap
-msgid "B<hook>"
+msgid "B<hooks>"
 msgstr ""
 
 #. type: Plain text
diff --git a/scripts/config.sh b/scripts/config.sh
index 7ecd72c..b467382 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -98,9 +98,9 @@ Cmdline ()
 				LIVE_KEYBOARD_OPTIONS="${_PARAMETER#live-config.keyboard-options=}"
 				;;
 
-			# 999-hook
-			live-config.hook=*)
-				LIVE_HOOK="${_PARAMETER#live-config.hook=}"
+			# 999-hooks
+			live-config.hooks=*)
+				LIVE_HOOKS="${_PARAMETER#live-config.hooks=}"
 				;;
 
 			# Shortcuts
diff --git a/scripts/config/999-hook b/scripts/config/999-hooks
similarity index 87%
rename from scripts/config/999-hook
rename to scripts/config/999-hooks
index bd38f92..59fff04 100755
--- a/scripts/config/999-hook
+++ b/scripts/config/999-hooks
@@ -8,21 +8,21 @@
 # under certain conditions; see COPYING for details.
 
 
-Hook ()
+Hooks ()
 {
-	if [ -z "${LIVE_HOOK}" ]
+	if [ -z "${LIVE_HOOKS}" ]
 	then
 		return
 	fi
 
-	echo -n " hook"
+	echo -n " hooks"
 
-	Process_hook
+	Process_hooks
 }
 
-Process_hook ()
+Process_hooks ()
 {
-	for _HOOK in $(echo ${LIVE_HOOK} | sed -e 's/|/ /g')
+	for _HOOK in $(echo ${LIVE_HOOKS} | sed -e 's/|/ /g')
 	do
 		_TMPFILE="$(mktemp -t live-config.XXXXXXXX)"
 
@@ -53,4 +53,4 @@ Process_hook ()
 	done
 }
 
-Hook
+Hooks

-- 
live-config

More information about the debian-live-changes mailing list