diff options
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 2 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index a9173e8..e3c27dc 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -278,7 +278,7 @@ if [ -e "$CWD/Manifest" ]; then MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`" fi - if [ ! -e "$MANIFEST_FILE" ]; then + if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then continue fi diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 72c970f..11532ac 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -512,7 +512,7 @@ function make_slack_required { } -function change_others_parameters { +function change_other_parameters { # Change others parameters started by '[[' in .mkbuild file sed '1,/#>>/ ! d' $MKBUILD_NAME | grep -v '^#' | grep '^\[\[[A-Za-z]' | \ @@ -729,10 +729,15 @@ function file_metainfo { # get integrity file metainformation # usage: file_metainfo <file> <file_type> - local size algo sum="" file="$1" file_type="$2" + local size algo sum="" file="$1" file_type="`echo $2 | tr '[:lower:]' '[:upper:]'`" - if [ ! -e "$file" ] || [ -z "$file_type" ]; then - return 1 + if [ -z "$file_type" ]; then + file_type="AUX" + fi + + if [ ! -e "$file" ]; then + echo "$file_type `basename $file` " # end space is important + [ $VERBOSE -eq $on ] && echo "Adding blank information for $file on Manifest. Please fix this." fi for algo in md5 sha1 sha256 sha512 rmd160; do @@ -745,15 +750,11 @@ function file_metainfo { function update_manifest_info { - # update Manifest meatinfo for a given file + # update Manifest metainfo for a given file # usage: update_manifest_info <file> <file_type> local tmpfile file="$1" file_type="`echo $2 | tr '[:lower:]' '[:upper:]'`" - if [ ! -e "$file" ]; then - return 1 - fi - if [ -z "$file_type" ]; then file_type="`file_extension $file | tr '[:lower:]' '[:upper:]'`" fi @@ -802,6 +803,9 @@ function update_manifest { fi done + # Add source code information + update_manifest $CONST_STRING dist + } # ---------------------------------------------------------------- @@ -1055,7 +1059,7 @@ if [ ! -z $MKBUILD_NAME ]; then # Others changes [ $VERBOSE -eq $on ] && echo -e "\nEdit others [[]] parameters ..." - change_others_parameters + change_other_parameters # Update Manifest file update_manifest |