diff options
author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 17:24:46 +0000 |
---|---|---|
committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 17:24:46 +0000 |
commit | 4ea9a07e87a67963f52e40c945d132a91b13f4f8 (patch) | |
tree | b9bdcc24b14a4322b0b5d6ce1c6d41f4140aaeb4 | |
parent | f8fd450c9b9561c29bfdba24bb87a9cc55fc889e (diff) | |
download | simplepkg-4ea9a07e87a67963f52e40c945d132a91b13f4f8.tar.gz simplepkg-4ea9a07e87a67963f52e40c945d132a91b13f4f8.tar.bz2 |
fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@602 04377dda-e619-0410-9926-eae83683ac58
-rw-r--r-- | trunk/src/createpkg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 9ce645a..83851cb 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -254,7 +254,6 @@ function load_parameters { # Load Createpkg parameters MAKEPKG_REPOS="`eval_parameter MAKEPKG_REPOS /var/simplepkg/repos`" MAKEPKG_REPOS_STYLE="`eval_parameter MAKEPKG_REPOS_STYLE none`" - MAKEPKG_REPOS_NOARCH="`eval_parameter MAKEPKG_REPOS_NOARCH $off`" NOARCH_REPOS="`eval_parameter MAKEPKG_REPOS /var/simplepkg/repos`/noarch" SOURCE_DIR="`eval_parameter SOURCE_DIR /var/simplepkg/sources`" SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/simplepkg/slackbuilds`" @@ -269,6 +268,7 @@ function load_parameters { REMOVE_OLD_PACKAGE="`eval_boolean_parameter REMOVE_OLD_PACKAGE $off`" MOVE_BIN_PACKAGE="`eval_boolean_parameter MOVE_BIN_PACKAGE $off`" MOVE_SLACK_REQUIRED="`eval_boolean_parameter MOVE_SLACK_REQUIRED $off`" + MAKEPKG_REPOS_NOARCH="`eval_parameter MAKEPKG_REPOS_NOARCH $off`" } @@ -692,7 +692,7 @@ echo Cleaning up the repository... svn_remove_empty_folders $MAKEPKG_REPOS # Update noarch repository -if [ "$MAKEPKG_REPOS_NOARCH" -eq $on ] && [ "`package_arch $PKG_NAME`" == "noarch" ]; then +if [ $MAKEPKG_REPOS_NOARCH -eq $on ] && [ "`package_arch $PKG_NAME`" == "noarch" ]; then echo Copying package to noarch repository... create_repo_folder $NOARCH_REPOS remove_old_package_data $NOARCH_REPOS |