From ef49517418cd469582a85250bedbdf07f3964ccd Mon Sep 17 00:00:00 2001 From: rudson Date: Wed, 11 Jul 2007 17:23:07 +0000 Subject: createpkg-1.1.0: reduzido a dependência com o .slackbuildrc adicionando as variáveis ao simplepkg.conf; substituído a chamada ao eval_config por função local: load_parameters; alterado a chamada ao SlackBuild com a passagem das variáveis; substituído valor de flags de 0 e 1 por on e off; pré-atualização ao common.sh no branch 0.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@400 04377dda-e619-0410-9926-eae83683ac58 --- branches/0.6/lib/common.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'branches/0.6/lib/common.sh') diff --git a/branches/0.6/lib/common.sh b/branches/0.6/lib/common.sh index e4ff2ff..4e18dfa 100644 --- a/branches/0.6/lib/common.sh +++ b/branches/0.6/lib/common.sh @@ -259,11 +259,16 @@ function eval_config { # ---------------------------------------------------------------- # createpkg and mkbuild section - SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/slackbuilds`" - MAKEPKG_REPOS="`eval_parameter MAKEPKG_REPOS /var/simplaret/binaries`" - SOURCE_DIR="`eval_parameter SOURCE_DIR /var/sources`" - REMOVE_OLD_PACKAGE="`eval_boolean_parameter REMOVE_OLD_PACKAGE 1`" - MOVE_BIN_PACKAGE="`eval_boolean_parameter MOVE_BIN_PACKAGE 1`" + #MAKEPKG_REPOS="`eval_parameter MAKEPKG_REPOS /var/simplaret/repos`" + #SOURCE_DIR="`eval_parameter SOURCE_DIR /var/simplaret/sources`" + #SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/simplaret/slackbuilds`" + + #COLOR_MODE="`eval_parameter COLOR_MODE none`" + #CREATE_ARCH="`eval_parameter CREATE_ARCH i486`" + #CREATE_CLEANUP="`eval_parameter CREATE_CLEANUP 'yes'`" + + #REMOVE_OLD_PACKAGE="`eval_parameter REMOVE_OLD_PACKAGE off`" + #MOVE_BIN_PACKAGE="`eval_parameter MOVE_BIN_PACKAGE off`" # ---------------------------------------------------------------- else @@ -581,13 +586,11 @@ function svn_add_meta { } function gen_filelist { - # generate FILELIST.TXT - # usage: gen_filelist - - local cwd + # usage: gen_filelist - for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILELIST.TXT + find . -type f -name *.tgz -follow -print | sort | tr '\n' '\0' | \ + xargs -0r ls -ldL --time-style=long-iso > FILELIST.TXT echo "Created new FILELIST.TXT" } -- cgit v1.2.3