Merge lp:~cr3/checkbox/rename into lp:checkbox

[Marc Tardif]

This branch refactors the install script to be agnostic of variant name because it previously assumed (cli|gtk|urwid), which broken when the checkbox-certification-client and checkbox-certification-server packages were introduced.

[Daniel Manrique (roadmr)]

Looks simple but there's a lot of magic going on in here.

The magic seems to work, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-28 14:27:10 +0000
+++ debian/changelog	2011-11-29 20:27:24 +0000
@@ -8,7 +8,10 @@
   [Gabor Kelemen]
   * Fixed last two remaining strings with backslashes (LP: #868571)
 
- -- Daniel Manrique <[e-mail]>  Fri, 25 Nov 2011 13:04:55 -0500
+  [Marc Tardif]
+  * Refactored install script to be agnostic of variant name.
+
+ -- Marc Tardif <[e-mail]>  Tue, 29 Nov 2011 12:39:07 -0500
 
 checkbox (0.13) precise; urgency=low
 

=== modified file 'debian/checkbox-cli.postinst'
--- debian/checkbox-cli.postinst	2008-08-13 20:04:12 +0000
+++ debian/checkbox-cli.postinst	2011-11-29 20:27:24 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/checkbox-gtk.postinst'
--- debian/checkbox-gtk.postinst	2008-08-13 20:04:12 +0000
+++ debian/checkbox-gtk.postinst	2011-11-29 20:27:24 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/checkbox-urwid.postinst'
--- debian/checkbox-urwid.postinst	2010-05-20 09:00:22 +0000
+++ debian/checkbox-urwid.postinst	2011-11-29 20:27:24 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/hwtest-cli.postinst'
--- debian/hwtest-cli.postinst	2008-12-16 00:46:19 +0000
+++ debian/hwtest-cli.postinst	2011-11-29 20:27:24 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/hwtest-gtk.postinst'
--- debian/hwtest-gtk.postinst	2008-12-16 00:46:19 +0000
+++ debian/hwtest-gtk.postinst	2011-11-29 20:27:24 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'debian/hwtest.postinst'
--- debian/hwtest.postinst	2008-12-16 00:46:19 +0000
+++ debian/hwtest.postinst	2011-11-29 20:27:24 +0000
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+base_package="checkbox"
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 

=== modified file 'install/config'
--- install/config	2011-03-01 20:56:39 +0000
+++ install/config	2011-11-29 20:27:24 +0000
@@ -69,10 +69,10 @@
     configs_base = "/usr/share/%(base_name)s/configs/%(name)s.ini"
     examples_base = "/usr/share/%(base_name)s/examples/%(name)s.ini"
 
-    def __init__(self, name, configs_path=None, examples_path=None,
-                 templates_path=None):
+    def __init__(self, name, base_name=None, configs_path=None,
+                 examples_path=None, templates_path=None):
         self.name = name
-        self.base_name = re.sub(r"(-cli|-urwid|-gtk)$", "", name)
+        self.base_name = name if base_name is None else base_name
         self._configs_path = configs_path or self.configs_base \
             % {"name": name, "base_name": self.base_name}
         self._examples_path = examples_path or self.examples_base \
@@ -147,8 +147,7 @@
     if len(args) < 1:
         return 1
 
-    package = args.pop(0)
-    install = Install(package)
+    install = Install(*args)
 
     if options.output == "-":
          file = sys.stdout

=== modified file 'install/postinst'
--- install/postinst	2010-05-24 18:54:44 +0000
+++ install/postinst	2011-11-29 20:27:24 +0000
@@ -1,11 +1,13 @@
 package=`basename $0 .postinst`
+if [ -z "$base_package" ]; then
+    base_package="$package"
+fi
 config="/etc/checkbox.d/$package.ini"
 
 patch_configuration()
 {
     version="$1"
     previous_version=""
-    base_package=`echo $package | sed -e 's/hwtest/checkbox/' -e 's/\(-cli\|-urwid\|-gtk\)//'`
 
     while [ -n "$version" ]; do
         patch_file=""
@@ -43,15 +45,15 @@
 
 update_configuration()
 {
-    base_package=`echo $package | cut -d '-' -f '1'`
+    root_package=`echo $package | cut -d '-' -f '1'`
 
-    if [ "$base_package" != "hwtest" ]; then
+    if [ "$root_package" != "hwtest" ]; then
         # Create a temporary file to generate the suggested
         # configuration file.
         tempfile=`tempfile -m 0644 -p checkbox`
 
         # Update the temporary file with preseeded values.
-        /usr/share/checkbox/install/config --output=$tempfile $package
+        /usr/share/checkbox/install/config --output=$tempfile $package $base_package
 
         # Clobber the old config file.
         cp $tempfile $config