From afa962908f5ce9c88bfb219bab99af4506b7919b Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sun, 6 Jan 2019 18:19:46 +0100 Subject: [PATCH] move release.* scripts to tools/ --- release.py => tools/release.py | 2 +- release.sh => tools/release.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) rename release.py => tools/release.py (98%) rename release.sh => tools/release.sh (86%) diff --git a/release.py b/tools/release.py similarity index 98% rename from release.py rename to tools/release.py index 01771ea44e..2461d3943d 100755 --- a/release.py +++ b/tools/release.py @@ -64,7 +64,7 @@ def get_caps(module, config): return ['**** FILL ME **** (running weboob update could help)'] def new_modules(start, end): - #os.chdir(os.path.dirname(__file__)) + os.chdir(os.path.join(os.path.dirname(__file__), os.path.pardir)) modules_info = configparser.ConfigParser() with open('modules/modules.list') as f: modules_info.read_file(f) diff --git a/release.sh b/tools/release.sh similarity index 86% rename from release.sh rename to tools/release.sh index fa94c0711e..2882b76c26 100755 --- a/release.sh +++ b/tools/release.sh @@ -2,10 +2,12 @@ # This script is used to release a version. set -e +cd "$(dirname $0)/.." + function set_version { - echo -n "Replacing version in source files to $1" + echo -n "Replacing version in source files to $1... " sed -i "s/^\(\s*\)\(VERSION\|version\|release\|__version__\)\( *\)=\( *\)[\"'][0-9]\+\..\+[\"']\(,\?\)$/\1\2\3=\4'$1'\5/g" $(git ls-files -x contrib | grep "\(.py\|.rst\)$") - echo -n "done.\n" + echo -e "done.\n" } if [ -z "$1" ]; then @@ -19,7 +21,7 @@ echo "Generating ChangeLog..." export LANG=en_US.utf8 mv ChangeLog ChangeLog.old -./release.py prepare $VERSION > ChangeLog +tools/release.py prepare $VERSION > ChangeLog echo -e "\n" >> ChangeLog cat ChangeLog.old >> ChangeLog rm -f ChangeLog.old @@ -46,7 +48,7 @@ echo "Release tag:" git tag $VERSION -s -m "Weboob $VERSION" echo -ne "\n" -./release.py tarball $VERSION +tools/release.py tarball $VERSION echo -ne "\nDo you want to change the version number (y/n) " read change_version -- GitLab