diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-09-13 17:55:51 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-09-13 17:55:51 +0000 |
| commit | 3aab65168823b023b0f80d7069d5581a6de977bb (patch) | |
| tree | 8999854c1cde46bd5777e3f8a9b8136c6275c955 | |
| parent | 4a92eea3c850c549349c124dec37138044e752b3 (diff) | |
| download | simplepkg-3aab65168823b023b0f80d7069d5581a6de977bb.tar.gz simplepkg-3aab65168823b023b0f80d7069d5581a6de977bb.tar.bz2 | |
lots of fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@441 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/install/doinst.sh | 1 | ||||
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild (renamed from trunk/mkbuild/generic.mkSlackBuild.new) | 0 | ||||
| -rwxr-xr-x | trunk/simplepkg.SlackBuild | 2 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/trunk/install/doinst.sh b/trunk/install/doinst.sh index a9d11ce..f3af964 100644 --- 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 index 7c8620c..7c8620c 100644 --- a/trunk/mkbuild/generic.mkSlackBuild.new +++ b/trunk/mkbuild/generic.mkSlackBuild diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild index 0c181c7..1b1f024 100755 --- 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 7d131e3..e024ef8 100755 --- 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 { |