Bug#561712: live-magic: helpers now installed in /usr/share/live-helper/helpers and not /usr/bin

[Daniel Baumann <daniel@debian.org>]

Julien Valroff wrote:
> Helpers are now installed to /usr/share/live-helper/helpers instead of
> /usr/bin which causes live-magic to be totally unusable.

the location is not the problem, but the s/lh_$command/lh command/. 
attached patch should do it.

Regards,
Daniel

--
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baumann@panthera-systems.net
Internet:       http://people.panthera-systems.net/~daniel-baumann/

diff --git a/DebianLive/__init__.py b/DebianLive/__init__.py
index ada8e49..a78a740 100644
--- a/DebianLive/__init__.py
+++ b/DebianLive/__init__.py
@@ -40,7 +40,7 @@ class Config(object):
 
         options = ["--%s='%s'" % (k.replace('_', '-'), v)
             for k, v in kwargs.iteritems()]
-        cmd = 'cd "%s"; lh_config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
+        cmd = 'cd "%s"; lh config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
             ' '.join(options))
 
         result, out = commands.getstatusoutput(cmd)
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 8677daf..4e0d24e 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -100,7 +100,7 @@ class BuildController(object):
 
         def ok_clean():
             set_cleaning_status()
-            _exec('lh_clean --chroot --stage --source --cache',
+            _exec('lh clean --chroot --stage --source --cache',
                 'rm -rf config/ binary/ tftpboot/',
                 'chown -R %d:%d .' % (self.uid, self.gid))
             return OK
@@ -112,7 +112,7 @@ class BuildController(object):
 
         def failed_clean():
             set_cleaning_status()
-            _exec('lh_clean --purge', 'rm -rvf config/',
+            _exec('lh clean --purge', 'rm -rvf config/',
                 'chown -R %d:%d .' % (self.uid, self.gid))
             return FAILED
 
@@ -123,7 +123,7 @@ class BuildController(object):
 
         def cancelled_clean():
             set_cleaning_status()
-            _exec('lh_clean --purge', 'rm -rvf $(pwd)')
+            _exec('lh clean --purge', 'rm -rvf $(pwd)')
             return CANCELLED
 
         if self.state == BUILDING:
diff --git a/misc/live-magic-builder b/misc/live-magic-builder
index f0d4307..2c0165f 100755
--- a/misc/live-magic-builder
+++ b/misc/live-magic-builder
@@ -36,7 +36,7 @@ Check () {
 }
 
 Clean () {
-	lh_clean --purge | tee -a ${LOG}
+	lh clean --purge | tee -a ${LOG}
 }
 
 Save_config () {
@@ -53,10 +53,10 @@ Check
 Clean
 Save_config
 Set_status building
-Echo_verbose "lh_build starting in $(pwd)"
+Echo_verbose "lh build starting in $(pwd)"
 Echo_line
-lh_build 2>&1 | tee -a ${LOG}
+lh build 2>&1 | tee -a ${LOG}
 Echo_line
-Echo_verbose "lh_build returned successfully"
+Echo_verbose "lh build returned successfully"
 Set_status ok
 exit 0