From a0ddd990879f0bd15e98889a58031303a707300a Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 2 Aug 2016 12:00:21 +0200 Subject: [PATCH] Minor update for automatic PyPI packaging --- extra/shutils/postcommit-hook | 12 +++++++----- extra/shutils/precommit-hook | 8 ++++---- lib/core/settings.py | 2 +- txt/checksum.md5 | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/extra/shutils/postcommit-hook b/extra/shutils/postcommit-hook index 75df3ce60..a00d41db9 100644 --- a/extra/shutils/postcommit-hook +++ b/extra/shutils/postcommit-hook @@ -8,14 +8,16 @@ FULLPATH=${SCRIPTPATH%/*}/$SETTINGS if [ -f $FULLPATH ] then - LINE=$(grep -o ${FULLPATH} -e 'VERSION = "[0-9.]*"'); - declare -a LINE; + LINE=$(grep -o ${FULLPATH} -e 'VERSION = "[0-9.]*"') + declare -a LINE NEW_TAG=$(python -c "import re, sys, time; version = re.search('\"([0-9.]*)\"', sys.argv[1]).group(1); _ = version.split('.'); print '.'.join(_[:-1]) if len(_) == 4 and _[-1] == '0' else ''" "$LINE") if [ -n "$NEW_TAG" ] then git commit -am "Automatic monthly tagging" - echo "Creating new tag ${NEW_TAG}"; - git tag $NEW_TAG; + echo "Creating new tag ${NEW_TAG}" + git tag $NEW_TAG git push origin $NEW_TAG + echo "Going to push PyPI package" + /bin/bash ${SCRIPTPATH%/*}/pypi.sh fi -fi; +fi diff --git a/extra/shutils/precommit-hook b/extra/shutils/precommit-hook index e7b21a1e0..b258a0dfc 100644 --- a/extra/shutils/precommit-hook +++ b/extra/shutils/precommit-hook @@ -12,19 +12,19 @@ CHECKSUM_FULLPATH=${SCRIPTPATH%/*}/$CHECKSUM if [ -f $SETTINGS_FULLPATH ] then - LINE=$(grep -o ${SETTINGS_FULLPATH} -e 'VERSION = "[0-9.]*"'); - declare -a LINE; + LINE=$(grep -o ${SETTINGS_FULLPATH} -e 'VERSION = "[0-9.]*"') + declare -a LINE INCREMENTED=$(python -c "import re, sys, time; version = re.search('\"([0-9.]*)\"', sys.argv[1]).group(1); _ = version.split('.'); _.append(0) if len(_) < 3 else _; _[-1] = str(int(_[-1]) + 1); month = str(time.gmtime().tm_mon); _[-1] = '0' if _[-2] != month else _[-1]; _[-2] = month; print sys.argv[1].replace(version, '.'.join(_))" "$LINE") if [ -n "$INCREMENTED" ] then sed -i "s/${LINE}/${INCREMENTED}/" $SETTINGS_FULLPATH - echo "Updated ${INCREMENTED} in ${SETTINGS_FULLPATH}"; + echo "Updated ${INCREMENTED} in ${SETTINGS_FULLPATH}" else echo "Something went wrong in VERSION increment" exit 1 fi git add "$SETTINGS_FULLPATH" -fi; +fi truncate -s 0 "$CHECKSUM_FULLPATH" cd $PROJECT_FULLPATH && for i in $(find . -name "*.py" -o -name "*.xml" -o -iname "*_" | sort); do git ls-files $i --error-unmatch &>/dev/null && md5sum $i | sed 's/\.\///' >> "$CHECKSUM_FULLPATH"; git add "$CHECKSUM_FULLPATH"; done diff --git a/lib/core/settings.py b/lib/core/settings.py index 8539effaa..583f9a9d9 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import OS from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.8.9" +VERSION = "1.0.8.10" REVISION = getRevisionNumber() TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 696deb524..a2d4484e9 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -e173318a21fabbaa36abaec12ebbcb15 lib/core/settings.py +80701fc53b5e6712b901ac39315af94d lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py 0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py