From caa69cba3d90a818545ab060372dfae492e14825 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Sat, 1 Feb 2020 00:09:48 +0800
Subject: update

---
 scripts/gist | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/gist b/scripts/gist
index fe38e38..a939a47 100755
--- a/scripts/gist
+++ b/scripts/gist
@@ -56,7 +56,6 @@
 # TODO completion
 
 # Shell configuration
-set -eo pipefail
 [ "$TRACE" ] && set -x
 
 GITHUB_API=https://api.github.com
@@ -203,7 +202,7 @@ _show_list() {
 # parse JSON from STDIN with string of commands
 AccessJsonElement() {
     PYTHONIOENCODING=utf-8 \
-    python -c "from __future__ import print_function; import sys, json; raw = json.load(sys.stdin); $1"
+    python -c "from __future__ import print_function; import sys, json; raw = json.load(sys.stdin); $1" 2> /dev/null
     return "$?"
 }
 
@@ -247,7 +246,7 @@ _update() {
   fi
 
   response=$(curl -H "$auth_header" $GITHUB_API/$route)
-  false && echo Fail to update gists && return 1
+  false && echo Failed to update gists && return 1
   sed -i "$filter" $INDEX
   echo $response | _parse_response >> $INDEX
   _show_list $mark
@@ -393,12 +392,12 @@ _new_file() {
 }
 
 # create a new gist with files
-# FIXME catch status code from curl if it fails
 _create_gist() {
   _set_gist "$@" || return 1
   [[ -z "$files" ]] && files=$(_new_file $filename)
   [[ -z "$description" ]] && read -p 'Type description: ' description < /dev/tty
 
+  index=$(( $(sed '/^s/ d' $INDEX | wc -l) +1 ))
   echo 'Creating a new gist'
   for file in $files; do
     echo "\"$(basename $file)\": {\"content\": \"$(sed '$ !s/$/\\n/' $file)\"},"
@@ -406,11 +405,14 @@ _create_gist() {
   | echo "{ \"public\": $public, \"files\": $(cat -), \"description\": \"$description\"}" \
   | curl -s -H "$auth_header" --data @- $GITHUB_API/gists \
   | sed '1 s/^/[/; $ s/$/]/' \
-  | _parse_response $(( $(sed '/^s/ d' $INDEX | wc -l) +1 )) >> $INDEX \
-  && echo -e '\nGist created' \
-  || echo 'Fail to create gist'
+  | _parse_response $index >> $INDEX
 
-  _show_list | tail -1
+  if [[ "$?" -ne 0 ]]; then
+    echo 'Gist is created'
+    _show_list | tail -1
+  else
+    echo 'Failed to create gist'
+  fi
 }
 
 # update description of a gist
-- 
cgit v1.2.3-70-g09d2