diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 366c5990..7d189472 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -362,7 +362,7 @@ class SvcHub(object): src = ansi_re.sub("", src) elif c: if isinstance(c, int): - msg = "\033[3{}m{}".format(c, msg) + msg = "\033[3{}m{}\033[0m".format(c, msg) elif "\033" not in c: msg = "\033[{}m{}\033[0m".format(c, msg) else: diff --git a/copyparty/up2k.py b/copyparty/up2k.py index bc3fa9b0..27562d29 100644 --- a/copyparty/up2k.py +++ b/copyparty/up2k.py @@ -1137,9 +1137,9 @@ class Up2k(object): m = "database is version {}, this copyparty only supports versions <= {}" raise Exception(m.format(ver, DB_VER)) - msg = "creating new DB (old is bad); backup: {}" + msg = "creating new DB (old is bad); backup: " if ver: - msg = "creating new DB (too old to upgrade); backup: {}" + msg = "creating new DB (too old to upgrade); backup: " cur = self._backup_db(db_path, cur, ver, msg) db = cur.connection diff --git a/scripts/make-sfx.sh b/scripts/make-sfx.sh index 63d8b8d8..75f9c5bc 100755 --- a/scripts/make-sfx.sh +++ b/scripts/make-sfx.sh @@ -266,7 +266,7 @@ rm have find | grep -E '\.py$' | grep -vE '__version__' | tr '\n' '\0' | - xargs -0 $pybin ../scripts/uncomment.py + xargs -0 "$pybin" ../scripts/uncomment.py f=dep-j2/jinja2/constants.py awk '/^LOREM_IPSUM_WORDS/{o=1;print "LOREM_IPSUM_WORDS = u\"a\"";next} !o; /"""/{o=0}' <$f >t @@ -386,7 +386,7 @@ suf= suf=-gz } -$pybin $py --sfx-make tar.bz2 $ver $ts +"$pybin" $py --sfx-make tar.bz2 $ver $ts mv sfx.out $sfx_out$suf.py exts+=($suf.py)