aboutsummaryrefslogtreecommitdiff
path: root/trunk/src/mkbuild
diff options
context:
space:
mode:
authorrudson <rudson@04377dda-e619-0410-9926-eae83683ac58>2009-06-07 12:49:52 +0000
committerrudson <rudson@04377dda-e619-0410-9926-eae83683ac58>2009-06-07 12:49:52 +0000
commit763e77bbe55fad4af62a5c2f27a6a2e83ac67405 (patch)
tree0f9ee8b08a765a16d3c85474863249acb12b3535 /trunk/src/mkbuild
parent222d797e78fbbda8ab9815d58f941cddef425dcd (diff)
downloadsimplepkg-763e77bbe55fad4af62a5c2f27a6a2e83ac67405.tar.gz
simplepkg-763e77bbe55fad4af62a5c2f27a6a2e83ac67405.tar.bz2
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@808 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/mkbuild')
-rwxr-xr-xtrunk/src/mkbuild54
1 files changed, 28 insertions, 26 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index b490d6e..9be4a16 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -102,6 +102,8 @@ ${red}DESCRIPTION${normal}
print debug information
${red}-e${normal}, ${red}--edit${normal}
edit a mkbuild
+ ${red}-um${normal}, ${red}--update-manifest${normal}
+ update manifest file
${red}-wc${normal}, ${red}--working-copy${normal}
create an unversioned mkbuild working copy
${red}--get-param-copy${normal}
@@ -450,6 +452,7 @@ function start_build {
edit_file "VERSION" "$VERSION" $1
edit_file "SOURCE NAME CONSTRUCTION STRING" "$CONST_STRING" $1
edit_file "EXTENSION" "$EXTENSION" $1
+ edit_file "MKBUILD COMPRESS" "$MKBUILD_COMPRESS" $1
edit_file "DOWNLOAD FOLDER URL" "$URL_BASE" $1
edit_file "OTHER CONFIGURE ARGS" "$OPTIONS" $1
edit_file "DOCUMENTATION FILES" "$DOCFILES" $1
@@ -470,6 +473,9 @@ function clear_files {
[ ! -z $AUX_TMP ] && rm $AUX_TMP 2>/dev/null
[ ! -z $SLACKBUILD_TEMP ] && rm $SLACKBUILD_TEMP 2>/dev/null
[ ! -z $DIFF_FILE ] && rm $DIFF_FILE 2>/dev/null
+ if [ "`ls $TMP/`" == "" ]; then
+ rm -rf $TMP
+ fi
chmod 755 *.SlackBuild 2>/dev/null
}
@@ -517,15 +523,6 @@ function activate_sections {
set_status $SECTION $STATUS $SLACKBUILD_TEMP
done
- #if [ $SVN_MOD -eq $on -o $URL == "" ]; then
- # LIST_OFF="download_source md5sum_download_and_check_0 md5sum_download_and_check_1 gpg_signature_check untar_source"
- # verbose -e "\nSubversion or empty URL changes:"
- # for i in $LIST_OFF; do
- # set_status $i "off" $SLACKBUILD_TEMP
- # done
- # [ $SVN_MOD -eq $on ] && set_status svn_source "on" $SLACKBUILD_TEMP
- #fi
-
}
function build_slackbuild {
@@ -539,9 +536,11 @@ function build_slackbuild {
sed -i '/^<.*$/ d' $SLACKBUILD_TEMP
# Remove clear lines
# isto pode ser feito com "cat -s SLACKBUILD_TEMP ..."
- sed -i ':i ; $! N; s/\n/Ø/ ; t i ; s/Ø\{3,\}/ØØ/g ; s/Ø/\n/g' $SLACKBUILD_TEMP
+ #sed -i ':i ; $! N; s/\n/Ø/ ; t i ; s/Ø\{3,\}/ØØ/g ; s/Ø/\n/g' $SLACKBUILD_TEMP
+ cat -s $SLACKBUILD_TEMP > $SLACKBUILD
# Remove from frist line do #!/... line
- sed '1,/^#\!/ {/^#\!/ b; d }' $SLACKBUILD_TEMP > $SLACKBUILD
+ #sed '1,/^#\!/ {/^#\!/ b; d }' $SLACKBUILD_TEMP > $SLACKBUILD
+ sed -i '1,/^#\!/ {/^#\!/ b; d }' $SLACKBUILD
}
@@ -672,7 +671,7 @@ function apply_mkpatch {
}
# ----------------------------------------------------------------
-# svn functions
+# svn functions
# ----------------------------------------------------------------
function submit_slackbuild {
@@ -756,7 +755,7 @@ function submit_mkbuild {
echo "Removing mkbuild found at old path $oldplace"
svn_del $oldplace
fi
- done
+ done
submit_cleanup
@@ -776,7 +775,7 @@ function submit_cleanup {
}
-function import_mkbuilds {
+function import_mkbuilds {
# import mkbuilds into a subversion repository
# usage: repository_import [repository]
@@ -787,7 +786,7 @@ function import_mkbuilds {
repository="file:////var/svn/mkbuilds"
fi
- repository_import $MKBUILDS_DIR $repository
+ repository_import $MKBUILDS_DIR $repository
}
@@ -802,7 +801,7 @@ function import_slackbuilds {
repository="file:////var/svn/slackbuilds"
fi
- repository_import $SLACKBUILDS_DIR $repository
+ repository_import $SLACKBUILDS_DIR $repository
}
@@ -829,7 +828,7 @@ function repository_status {
}
# ----------------------------------------------------------------
-# general functions
+# general functions
# ----------------------------------------------------------------
function validate_parameter {
@@ -876,7 +875,7 @@ function decompress_find {
function load_parameters {
# Load Createpkg parameters
- SOURCE_DIR="`eval_parameter SOURCE_DIR /var/simplepkg/sources`"
+ SOURCE_DIR="`eval_parameter SOURCE_DIR /var/simplepkg/sources`"
SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/simplepkg/slackbuilds`"
[ ! -d $SLACKBUILDS_DIR ] && mkdir -p $SLACKBUILDS_DIR
@@ -890,7 +889,9 @@ function load_parameters {
COLOR_MODE="`eval_parameter COLOR_MODE none`"
TMP="`eval_parameter TMP /tmp`"
+ [ ! -e $TMP ] && mkdir -p $TMP
+ MKBUILD_COMPRESS="`eval_parameter MKBUILD_COMPRESS tgz`"
MKBUILD_AUTHOR="`eval_parameter MKBUILD_AUTHOR`"
MKBUILD_AUTHOR_INITIALS="`eval_parameter MKBUILD_AUTHOR_INITIALS`"
@@ -907,7 +908,7 @@ function load_parameters {
GPG_AGENT_OPTION="--use-agent"
else
GPG_AGENT_OPTION=""
- fi
+ fi
# For use at common.sh functions
SIGN="$SIGN_MANIFESTS"
@@ -987,7 +988,7 @@ function file_metainfo {
if [ "$file_type" == "DIST" ] || [ "$file_type" == "PATCH" ]; then
echo "Please make sure that the following hashes are correct:"
grep -e "^$file_type $dist_name " $manifest_file
- fi
+ fi
}
@@ -1066,10 +1067,10 @@ function edit_manifest {
else
echo "Can't get $DIST_SRC_NAME."
fi
- fi
+ fi
else
# Add source code information if its not already there
- if ! grep -q -e "^DIST $DIST_SRC_NAME " $WORK/Manifest; then
+ if ! grep -q -e "^DIST $DIST_SRC_NAME " $WORK/Manifest; then
update_manifest_info $DIST_SRC_NAME dist
fi
fi
@@ -1092,7 +1093,7 @@ function edit_manifest {
for i in `find $WORK | grep -E -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$|Manifest$)\*{0,1}$' | \
grep -E -v '(.diff$|.diff.gz$|.diff.bz2$|.patch$|.patch.gz$|.patch.bz2$)\*{0,1}$' | \
grep -v "/\.svn"`; do
- # Avoid folders, dotfiles and DIST files
+ # Avoid folders, dotfiles and DIST files
if [ ! -d "$WORK/$i" ] && \
[ "`basename $i`" != "$DIST_SRC_NAME" ] && \
! echo "`basename $i`" | grep -q -e "^\."; then
@@ -1252,7 +1253,7 @@ function update_manifest {
# Get mkbuild values
get_mkbuild_values
-
+
# Update the Manifest
edit_manifest --update
@@ -1564,7 +1565,7 @@ function search_mkbuild {
fi
if [ ! -z "$MKBUILD_PATH" ]; then
- if echo $name | grep -q -e "\.mkbuild$"; then
+ if echo $name | grep -q -e "\.mkbuild$"; then
if [ -d "$MKBUILDS_DIR/$MKBUILD_PATH" ]; then
find $MKBUILDS_DIR/$MKBUILD_PATH -name $MKBUILD_NAME
else
@@ -1583,7 +1584,7 @@ function search_mkbuild {
find $MKBUILDS_DIR -name $MKBUILD_NAME
fi
fi
-
+
}
function set_mkbuild_name {
@@ -1822,6 +1823,7 @@ SLACKDESC_LEN=78
# Load error codes
error_codes
+# Show help if has no arguments
[ $# -eq 0 ] && mkbuild_use && exit 1
# Configure input parameters