lots of fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@441 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/install/doinst.sh b/trunk/install/doinst.sh
index a9d11ceca0714e514f4fc064b07a3feae42876ea..f3af964c364f1e87ae847e144e12e1fe5467b93f 100644 (file)
--- a/trunk/install/doinst.sh
+++ b/trunk/install/doinst.sh
@@ -1,3 +1,2 @@
 ( if [ ! -f "etc/simplepkg/simplepkg.conf" ]; then mv etc/simplepkg/simplepkg.conf.new etc/simplepkg/simplepkg.conf; fi )
 ( if [ ! -f "etc/simplepkg/repos.conf" ]; then mv etc/simplepkg/repos.conf.new etc/simplepkg/repos.conf; fi )
-( if [ ! -f "etc/simplepkg/defaults/mkbuild/generic.mkSlackBuild" ]; then mv etc/simplepkg/defaults/mkbuild/generic.mkSlackBuild.new etc/simplepkg/defaults/mkbuild/generic.mkSlackBuild; fi )

diff --git a/trunk/mkbuild/generic.mkSlackBuild.new b/trunk/mkbuild/generic.mkSlackBuild
similarity index 100%
rename from trunk/mkbuild/generic.mkSlackBuild.new
rename to trunk/mkbuild/generic.mkSlackBuild

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 0c181c7ad18a9bddc5c52c036bc7d7030c06f94e..1b1f024c04d4fbac0e3bcd18fa05463c4c9ce5aa 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -18,7 +18,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre5"
+VERSION="0.6pre6"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 7d131e387b18e911177183fd94f71a2506796763..e024ef88894675766ed44d7e0cc8ce6e884da579 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -253,7 +253,7 @@ function get_variable {
     [ $# -ne 1 ] && mkbuild_error $ERROR_PROGRAM
     [ -z $MK_INPUT_FILE ] && echo "Warning: no [mkbuild_file]." && return 0
 
-    grep "^\[\[${1}\]\]" $MK_INPUT_FILE | cut -f2- -d= | tr -d '\"'
+    grep "^\[\[${1}\]\]" $MK_INPUT_FILE | cut -f2- -d= | sed -e 's/^"//' -e 's/"$//'
 }
 
 function edit_file {