diff options
| author | rudson <rudson@04377dda-e619-0410-9926-eae83683ac58> | 2007-12-02 01:10:57 +0000 |
|---|---|---|
| committer | rudson <rudson@04377dda-e619-0410-9926-eae83683ac58> | 2007-12-02 01:10:57 +0000 |
| commit | b323fe88f976fe2c5ca75fafba1e689b81e7fa3a (patch) | |
| tree | ce894000049a3aed06299e2eb57b32f7db91c588 /trunk | |
| parent | 76cb2a284631a2354a368320234b16f4316fd137 (diff) | |
| download | simplepkg-b323fe88f976fe2c5ca75fafba1e689b81e7fa3a.tar.gz simplepkg-b323fe88f976fe2c5ca75fafba1e689b81e7fa3a.tar.bz2 | |
bugfixes - ver CHANGELOG
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@462 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/doc/CHANGELOG | 7 | ||||
| -rw-r--r-- | trunk/lib/common.sh | 4 | ||||
| -rw-r--r-- | trunk/mkbuild/model.mkbuild | 22 | ||||
| -rw-r--r-- | trunk/src/createpkg | 2 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 6 |
5 files changed, 24 insertions, 17 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 0b9565b..db3ba54 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -22,6 +22,13 @@ simplepkg changelog - ERROR_PAR_NUMBER - incorrect number of parameters - ERROR_COMMON_NOT_FOUND - file common.sh not found + - bugfixes: + - common.sh: added ;; in the end from line 787 + - common.sh: change handle_error exit to "is_number $1 && exit $1 || exit 1" + - createpkg: protect parameters in solve_dep call with "" + - mkbuild: change "PACKGE NAME" parameter to "PKG NAME" + - model.mkbuild: change "PACKGE NAME" parameter to "PKG NAME" + 0.6pre1-10 - simplepkg.conf: diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 3db98a8..5a2cb35 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -784,7 +784,7 @@ function handle_error { $ERROR_PAR_NUMBER) eecho $error "$BASENAME: incorrect number of parameters" ;; $ERROR_COMMON_NOT_FOUND) - eecho $error "$BASENAME: file $COMMON_SH not found. Check your $BASENAME installation" + eecho $error "$BASENAME: file $COMMON_SH not found. Check your $BASENAME installation" ;; # # Createpkg errors @@ -810,7 +810,7 @@ function handle_error { eecho $error "$BASENAME: unknown error or user interrupt" ;; esac - exit $1 + is_number $1 && exit $1 || exit 1 } diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild index edd33c6..453a84f 100644 --- a/trunk/mkbuild/model.mkbuild +++ b/trunk/mkbuild/model.mkbuild @@ -146,15 +146,15 @@ off: postinstall_script # Sections changes #------------------ #>slackdesc -[[PACKAGE NAME]]: [[PACKAGE NAME]] by Slack.Sarava -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: -[[PACKAGE NAME]]: +[[PKG NAME]]: [[PKG NAME]] by Slack.Sarava +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: +[[PKG NAME]]: #<slackdesc diff --git a/trunk/src/createpkg b/trunk/src/createpkg index a08750e..5b5cf21 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -351,7 +351,7 @@ if [ ! -z "$SLACK_REQUIRED" -a $NO_DEPS -ne $on ]; then PROGRAM="`echo $dep | awk '{ print $1 }'`" CONDITION="`echo $dep | awk '{ print $2 }' | tr [=\>\<] [egl]`" VERSION="`echo $dep | awk '{ print $3 }' | tr -dc '[:digit:]'`" - solve_dep $PROGRAM $CONDITION $VERSION + solve_dep "$PROGRAM" "$CONDITION" "$VERSION" fi true done ) diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index f9281a2..45805f6 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -674,11 +674,11 @@ if [ ! -z "$MKBUILD_NAME" ]; then edit_file "YOUR SIGNATURE" "${AUTHOR_INITIALS}" ${MKBUILD_NAME}.mkbuild fi # Change Default SourceForge URL - [ -z "$URL" ] && URL="http://downloads.sourceforge.net/[[PACKAGE NAME]]/" + [ -z "$URL" ] && URL="http://downloads.sourceforge.net/[[PKG NAME]]/" edit_file "DEFAULT URL" "${URL}" ${MKBUILD_NAME}.mkbuild # Change Package Name - edit_file "PACKAGE NAME" "${MKBUILD_NAME}" ${MKBUILD_NAME}.mkbuild - edit_file "PACKAGE NAME" "${MKBUILD_NAME}" ${MKBUILD_NAME}.mkbuild + edit_file "PKG NAME" "${MKBUILD_NAME}" ${MKBUILD_NAME}.mkbuild + edit_file "PKG NAME" "${MKBUILD_NAME}" ${MKBUILD_NAME}.mkbuild # Print .mkbuild name echo "${MKBUILD_NAME}.mkbuild" |