improve the error message

2 files changed, 8 insertions, 6 deletions

diff --git a/name2color.py b/name2color.py
index e407a5a..2137687 100755
--- a/name2color.py
+++ b/name2color.py
@@ -11,7 +11,7 @@ def warn(msg):
 
 
 def error(msg):
-    print(msg + '\n')
+    print("ColorTag: {}\n".format(msg))
 
 
 saved_state = os.path.expanduser("~/.tmux-colortag.state")
@@ -67,14 +67,16 @@ if args.clear_name:
     changed = True
 
 if not (args.color_idx is None):
-    if args.color_idx < 0 and args.color_idx >= 256:
+    if args.color_idx < 0 or args.color_idx >= 256:
         error("invalid color code")
+        sys.exit(0)
     state[args.idx] = args.color_idx
     changed = True
 
 if not (args.color_name is None):
-    if args.color_name < 0 and args.color_name >= 256:
+    if args.color_name < 0 or args.color_name >= 256:
         error("invalid color code")
+        sys.exit(0)
     state[args.name] = args.color_name
     changed = True
 
diff --git a/tmux-colortag-prompt.sh b/tmux-colortag-prompt.sh
index 74cfdf8..8e2aeaf 100755
--- a/tmux-colortag-prompt.sh
+++ b/tmux-colortag-prompt.sh
@@ -6,10 +6,10 @@ case "$1" in
         tmux command-prompt -p '[ColorTag]:' "run-shell 'idx=#I name=#W $CURRENT_DIR/tmux-colortag-prompt.sh %1'"
         ;;
     color-idx)
-        "$CURRENT_DIR/name2color.py" "$idx" "$name" --color-idx "$2" || echo "invalid argument"
+        "$CURRENT_DIR/name2color.py" "$idx" "$name" --color-idx "$2" || echo "ColorTag: invalid argument"
         ;;
     color-name)
-        "$CURRENT_DIR/name2color.py" "$idx" "$name" --color-name "$2" || echo "invalid argument"
+        "$CURRENT_DIR/name2color.py" "$idx" "$name" --color-name "$2" || echo "ColorTag: invalid argument"
         ;;
     clear-idx)
         "$CURRENT_DIR/name2color.py" "$idx" "$name" --clear-idx
@@ -20,5 +20,5 @@ case "$1" in
     clear-all)
         "$CURRENT_DIR/name2color.py" "$idx" "$name" --clear
         ;;
-    *) echo "invalid ColorTag command"; exit 0;;
+    *) echo "ColorTag: invalid command"; exit 0;;
 esac