diff options
Diffstat (limited to 'trunk/src/mkbuild')
| -rwxr-xr-x | trunk/src/mkbuild | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 07c56e8..e55dfb4 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -19,7 +19,7 @@ # Based in model generic.SlackBuild of Luiz # # Version: -PROG_VERSION=1.2.5 +PROG_VERSION=1.2.6 PROG_NAME=`basename $0` #-------------------------------------------------------------------- @@ -79,6 +79,8 @@ ${red}DESCRIPTION${normal} this help mesage ${red}-n${normal}, ${red}--new${normal} ${green}<mkbuild_name>${normal} start a new mkbuild configure file + ${red}-s${normal}, ${red}--search${normal} ${green}<mkbuild_name>${normal} + search for a ${green}<mkbuild_name>${normal} file ${red}--sync${normal} synchronize mkbuilds repository ${red}-v${normal}, ${red}--version${normal} @@ -152,6 +154,12 @@ function set_parameters { ACTION="new" shift ;; + '-s'|'--search') + # Search for a mkbuild file + MKBUILD_NAME="${2//.mkbuild}.mkbuild" + [ ${MKBUILD_NAME:0:1} = "-" ] && handle_error $ERROR_MKBUILD_INPUT_PAR "--search <mkbuild_name>" + ACTION='search' + ;; '-d'|'--debug') # Debug mode set -x @@ -549,6 +557,10 @@ function commit_slackbuild { # add slack-required [ -e $WORK/slack-required ] && svn_add slack-required $SLACKBUILD_PATH + for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do + svn_add `basename $i` $SLACKBUILD_PATH + done + cd $WORK } @@ -563,7 +575,7 @@ function commit_mkbuild { echo -e "\nCommit $MKBUILD_NAME" # check mkbuild directory - [ ! -e $MKBUILDS_DIR ] && build_repo $MKBUILDS_DIR $MKBUILDS_SVN + [ ! -d $MKBUILDS_DIR ] && build_repo $MKBUILDS_DIR $MKBUILDS_SVN # Get mkbuild path in parameter file MKBUILD_PATH=$SLACKBUILD_PATH @@ -574,9 +586,12 @@ function commit_mkbuild { # Add mkbuild scripts # check path [ ! -e $MKBUILD_PATH ] && svn_mkdir $MKBUILD_PATH - # add SlackBuild + # add mkbuild svn_add $MKBUILD_NAME $MKBUILD_PATH + for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do + svn_add `basename $i` $MKBUILD_PATH + done cd $WORK } @@ -684,6 +699,7 @@ SIMPLEPKG_CONF="/etc/simplepkg/simplepkg.conf" BASENAME="`basename $0`" WORK=`pwd` LANG=en_US +EXIT_CODE=0 if [ -f "$COMMON_SH" ]; then source $COMMON_SH @@ -912,9 +928,14 @@ if [ ! -z $MKBUILD_NAME ]; then # Commit mkbuild [ $COMMIT_MKBUILD -eq $on ] && commit_mkbuild ;; + 'search') + find $MKBUILDS_DIR -iname $MKBUILD_NAME + EXIT_CODE=$? + ;; esac fi # Clear temporary files [ $VERBOSE -eq $on ] && echo -e "\nRemove temporary files ..." clear_files +exit $EXIT_CODE |