Merge branch '1.0-local' into 1.0

This commit is contained in:
xdrm-brackets 2017-03-10 15:19:19 +01:00
commit 0918f1f490
2 changed files with 15 additions and 2 deletions

0
first_update Normal file
View File

15
update
View File

@ -6,10 +6,23 @@ source $__DIR__/lib/include/bash/const;
source $__DIR__/lib/include/bash/func; source $__DIR__/lib/include/bash/func;
# [1] Send data + fetch configuration # [1] Send data + fetch configuration
test "$($SOURCE_DIR/lib/api/sync)" = "127" && slog "sync failed" - "update" && exit; if [ -e /home/sats/satsd/source/first_update ]; then
test "$($SOURCE_DIR/lib/api/init)" = "127" && slog "sync failed" - "update" && exit;
test $? -ne 0 && exit 127; test $? -ne 0 && exit 127;
rm /home/sats/satsd/source/first_update;
else
test "$($SOURCE_DIR/lib/api/sync)" = "127" && slog "sync failed" - "update" && exit;
test $? -ne 0 && exit 127;
fi;
# [2] Update source # [2] Update source
BRANCH=$(cat $BRANCH_CONF); BRANCH=$(cat $BRANCH_CONF);