From b26edefe3e16ff7c7a315f08a241a9cd25fbb162 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 7 May 2014 17:42:58 -0700 Subject: shred: perhaps alternate configs will work now - unable to test at the moment. Was a typo in FriendicaOAuth.sh so it's unlikely anybody has been using this recently. We'll probably need it for apps. --- util/shred/FriendicaOAuth.sh | 2 +- util/shred/shred | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/util/shred/FriendicaOAuth.sh b/util/shred/FriendicaOAuth.sh index 67f64b6eb..7f368508b 100755 --- a/util/shred/FriendicaOAuth.sh +++ b/util/shred/FriendicaOAuth.sh @@ -162,7 +162,7 @@ FO_statuses_home_timeline () { $(OAuth_param 'screen_name' $screen_name) $(OAuth_param 'count' $count) ) -g + local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]}) convscreen=$(OAuth_PE "$screen_name"); diff --git a/util/shred/shred b/util/shred/shred index 2e463ac6d..7a42a8d29 100755 --- a/util/shred/shred +++ b/util/shred/shred @@ -22,8 +22,6 @@ FCLI_RC="$HOME/.shred.rc" -# Source Config -[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1 # Source FriendicaOAuth.sh OAuth_sh=$(which FriendicaOAuth.sh) @@ -121,6 +119,9 @@ js () { load_config () { + # Source Config + [[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1 + [[ "$oauth_consumer_key" == "" ]] && show_config_help 1 [[ "$oauth_consumer_secret" == "" ]] && show_config_help 1 @@ -149,7 +150,7 @@ main () { fcli_in_reply_to_status_id= fcli_file= fcli_help_flag= - while getopts "c:s:r:f:h" name + while getopts "C:c:s:r:f:h" name do case $name in c) fcli_command="$OPTARG";; -- cgit v1.2.3