From 6c635487a263c293adb0a2d83013d0f64e3318a7 Mon Sep 17 00:00:00 2001 From: Wu Yufei Date: Fri, 13 Nov 2020 01:24:50 +0800 Subject: [PATCH] Fix uninstall code & Add python3 workaround for changelog.py --- build/changelog.py | 5 +++-- uninstall.sh | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/changelog.py b/build/changelog.py index 52661ea..549e917 100755 --- a/build/changelog.py +++ b/build/changelog.py @@ -7,8 +7,9 @@ import json import base64 import datetime -reload(sys) -sys.setdefaultencoding('utf8') +if sys.version_info.major < 3: + reload(sys) + sys.setdefaultencoding('utf8') try: import urllib3 diff --git a/uninstall.sh b/uninstall.sh index 4f4921a..c738b08 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -4,3 +4,4 @@ PREFIX=/usr/local rm -rIv $PREFIX/lib/zjunet rm -iv $PREFIX/bin/zjunet +rm -riv $PREFIX/share/zjunet