aboutsummaryrefslogtreecommitdiffstats
path: root/util/shred
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-18 16:26:27 -0700
committerfriendica <info@friendica.com>2014-06-18 16:26:27 -0700
commitc16b403cf7adf293a0c51d127d38d5794f9c2b36 (patch)
treea13ff3ba359a32df7e3c8e2a957b630e1f624304 /util/shred
parent80d84206ed9744ce033942d0379a97834a33b11c (diff)
downloadvolse-hubzilla-c16b403cf7adf293a0c51d127d38d5794f9c2b36.tar.gz
volse-hubzilla-c16b403cf7adf293a0c51d127d38d5794f9c2b36.tar.bz2
volse-hubzilla-c16b403cf7adf293a0c51d127d38d5794f9c2b36.zip
oh this is nice... http://kmkeen.com/jshon - this is what we need to make shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files.
Diffstat (limited to 'util/shred')
-rwxr-xr-xutil/shred/ShredOAuth.sh (renamed from util/shred/FriendicaOAuth.sh)0
-rwxr-xr-xutil/shred/shred16
2 files changed, 11 insertions, 5 deletions
diff --git a/util/shred/FriendicaOAuth.sh b/util/shred/ShredOAuth.sh
index 76858d73c..76858d73c 100755
--- a/util/shred/FriendicaOAuth.sh
+++ b/util/shred/ShredOAuth.sh
diff --git a/util/shred/shred b/util/shred/shred
index 9af554032..2fd913d65 100755
--- a/util/shred/shred
+++ b/util/shred/shred
@@ -112,10 +112,14 @@ load_config () {
# Source Config
[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1
+ THISDIR=$(dirname $0)
+ if [ $THISDIR != '' ]; then THISDIR=. ; fi
+ PATH=$THISDIR:$PATH
- # Source FriendicaOAuth.sh
- OAuth_sh=$(which FriendicaOAuth.sh)
- (( $? != 0 )) && echo 'Unable to locate FriendicaOAuth.sh! Make sure it is in searching PATH.' && exit 1
+
+ # Source ShredOAuth.sh
+ OAuth_sh=$(which ShredOAuth.sh)
+ (( $? != 0 )) && echo 'Unable to locate ShredOAuth.sh! Make sure it is in searching PATH.' && exit 1
source "$OAuth_sh"
# Source JSON.sh
@@ -213,7 +217,9 @@ main () {
*)
FO_command $fcli_command
- JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
+ echo $FO_ret
+
+# JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
# for a in ${JS_Parsed[@]}; do
@@ -222,7 +228,7 @@ main () {
# echo "$JS_Parsed" | js ${a} ${b}
# done
# else
- echo "$JS_Parsed"
+# echo "$JS_Parsed"
# fi
# done
return $FO_rval