From 21b68a193e5d96cd16366596236c57fd70b5a467 Mon Sep 17 00:00:00 2001 From: Fabian Martinez Portantier Date: Mon, 15 Apr 2019 01:18:41 -0300 Subject: [PATCH] minor fixes --- build_all | 23 ----------------------- build_deb | 8 ++++++++ build_deb.sh | 15 --------------- habu/cli/cmd_config_show.py | 2 +- upload | 8 ++++++++ 5 files changed, 17 insertions(+), 39 deletions(-) delete mode 100755 build_all create mode 100755 build_deb delete mode 100755 build_deb.sh create mode 100755 upload diff --git a/build_all b/build_all deleted file mode 100755 index 25fa38d..0000000 --- a/build_all +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -./readme_generate - -git add --all . -git commit -git push - -python3 setup.py sdist upload --sign --identity fabian@portantier.com - -# Fix the readme problem - Step 1 -#mv README.rst _README.rst -#sed -i s/README.rst/README.txt/g setup.py - -# Main work -python3 setup.py sdist -rm -Rf deb_dist -python3 setup.py --command-packages=stdeb.command bdist_deb - -# Fix the readme problem - Step 2 -#mv _README.rst README.rst -#sed -i s/README.txt/README.rst/g setup.py - diff --git a/build_deb b/build_deb new file mode 100755 index 0000000..be5d2c5 --- /dev/null +++ b/build_deb @@ -0,0 +1,8 @@ +#!/bin/sh + +./readme_generate + +python3 setup.py sdist +rm -Rf deb_dist +python3 setup.py --command-packages=stdeb.command bdist_deb + diff --git a/build_deb.sh b/build_deb.sh deleted file mode 100755 index 253584f..0000000 --- a/build_deb.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# Fix the readme problem - Step 1 -#mv README.md README.mda -#sed -i s/README.md/README.txt/g setup.py - -# Main work -python3 setup.py sdist -rm -Rf deb_dist -python setup.py --command-packages=stdeb.command bdist_deb - -# Fix the readme problem - Step 2 -#mv README.mda README.md -#sed -i s/README.txt/README.md/g setup.py - diff --git a/habu/cli/cmd_config_show.py b/habu/cli/cmd_config_show.py index 229e017..f8575d0 100644 --- a/habu/cli/cmd_config_show.py +++ b/habu/cli/cmd_config_show.py @@ -33,7 +33,7 @@ def cmd_config_show(option, show_keys): if 'KEY' in key: habucfg[key] = '*************' - print(json.dumps(habucfg, indent=4, sort_keys=True)) + print(json.dumps(habucfg, indent=4, sort_keys=True, default=str)) if __name__ == '__main__': diff --git a/upload b/upload new file mode 100755 index 0000000..babfb67 --- /dev/null +++ b/upload @@ -0,0 +1,8 @@ +#!/bin/sh + +git add --all . +git commit +git push + +python3 setup.py sdist upload --sign --identity fabian@portantier.com +