harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok *now* shred works with alternate config files

Browse Source
This commit is contained in:
friendica 2014-05-07 20:31:21 -07:00
parent b26edefe3e
commit e22e94cd97
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/zot.php
View File

@ -171,6 +171,10 @@ function zot_finger($webbie,$channel,$autofallback = true) {
return array('success' => false);
}
// potential issue here; the xchan_addr points to the primary hub.
// The webbie we were called with may not, so it might not be found
// unless we query for hubloc_addr instead of xchan_addr
$r = q("select xchan.*, hubloc.* from xchan
left join hubloc on xchan_hash = hubloc_hash
where xchan_addr = '%s' and (hubloc_flags & %d) limit 1",

22
util/shred/shred
View File

@ -23,16 +23,6 @@
FCLI_RC="$HOME/.shred.rc"
# 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 "$OAuth_sh"
# Source JSON.sh
JSON_sh=$(which JSON.sh)
(( $? != 0 )) && echo 'Unable to locate JSON.sh! Make sure it is in searching PATH.' && exit 1
source "$JSON_sh"
usage () {
echo "usage: $0 options
@ -122,6 +112,18 @@ load_config () {
# Source Config
[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1
# 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 "$OAuth_sh"
# Source JSON.sh
JSON_sh=$(which JSON.sh)
(( $? != 0 )) && echo 'Unable to locate JSON.sh! Make sure it is in searching PATH.' && exit 1
source "$JSON_sh"
[[ "$oauth_consumer_key" == "" ]] && show_config_help 1
[[ "$oauth_consumer_secret" == "" ]] && show_config_help 1