From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 14 Oct 2007 14:19:39 +0000 (+0200)
Subject: Fix some autopackage bugs.
X-Git-Tag: 1.0~9
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=849936146339069b41303346bc69b8cf9a28a150

Fix some autopackage bugs.
---

diff --git a/autopackage/dolcon.apspec.in b/autopackage/dolcon.apspec.in
index 0aa41a5..6db26e0 100644
--- a/autopackage/dolcon.apspec.in
+++ b/autopackage/dolcon.apspec.in
@@ -43,7 +43,7 @@ require @gtk.org/gtk 2.4
 require @dolda2000.com/fredrik/doldaconnect/dcuilib 1.1
 
 [Install]
-installExe bin/dolcon
+installExe dolcon
 installLocale share/locale
 
 [Uninstall]
diff --git a/autopackage/doldacond.apspec.in b/autopackage/doldacond.apspec.in
index 1884bf9..383c741 100644
--- a/autopackage/doldacond.apspec.in
+++ b/autopackage/doldacond.apspec.in
@@ -42,8 +42,8 @@ require @bzip.org/libbz2 1
 require @gnu.org/gdbm 3
 
 [Install]
-installExe bin/doldacond bin/locktouch bin/tthsum
-copyFiles libexec/speedrec "$PREFIX/libexec"
+installExe doldacond locktouch tthsum
+copyFiles speedrec "$PREFIX/libexec"
 copyFiles etc/* "$PREFIX/etc"
 
 [Uninstall]
diff --git a/autopackage/guishell.apspec.in b/autopackage/guishell.apspec.in
index ca3ec38..3479b14 100644
--- a/autopackage/guishell.apspec.in
+++ b/autopackage/guishell.apspec.in
@@ -35,6 +35,8 @@ installExe bin/dolcon-launch
 installExe bin/doldacond-shell
 installLocale share/locale
 installIcon share/icons/hicolor
+createBootstrapScript "$PREFIX/bin/dolcon-launch" "$PREFIX/bin/dolcon-launch.apkg"
+sed -i 's/\(Exec *= *dolcon-launch\)/\1.apkg/' share/applications/dolcon.desktop
 installMenuItem "Network/File sharing" share/applications/dolcon.desktop
 
 [Uninstall]