From d4b14c1d02317dfe39dc43482ff6cda1a9680bbf Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 30 Jan 2017 10:39:45 +0100
Subject: [PATCH] Bash/Php const+func with source -> update bootloader

---
 daemon                          | 10 ++--------
 lib/api/source/fetch.php        |  2 +-
 lib/api/source/sync.php         |  2 +-
 lib/cyclic-hash/source/decr.php |  2 +-
 lib/cyclic-hash/source/hash.php |  2 +-
 lib/cyclic-hash/source/new.php  |  2 +-
 lib/include/bash/const          | 34 +++++++++++++++++++++++++++++++++
 lib/include/bash/func           | 32 +++++++++++++++++++++++++++++++
 lib/include/{ => php}/const     |  2 +-
 lib/include/{ => php}/func      |  0
 lib/mfrc522/source/read.php     |  2 +-
 update                          | 13 +++++++++----
 12 files changed, 84 insertions(+), 19 deletions(-)
 create mode 100755 lib/include/bash/const
 create mode 100755 lib/include/bash/func
 rename lib/include/{ => php}/const (91%)
 rename lib/include/{ => php}/func (100%)

diff --git a/daemon b/daemon
index 591176d..4fae714 100755
--- a/daemon
+++ b/daemon
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-c=0;
+ABSPATH=$( dirname $(realpath $0) );
 
-while [ 1 ]; do
-
-	echo "daemon launched $c";
-	sleep 1;
-
-	c=`expr $c + 1`;
-done;
+$ABSPATH/lib/mfrc522/loop;
diff --git a/lib/api/source/fetch.php b/lib/api/source/fetch.php
index 765c1c4..2f6eab3 100755
--- a/lib/api/source/fetch.php
+++ b/lib/api/source/fetch.php
@@ -1,6 +1,6 @@
 <?php
 
-	require_once __DIR__.'/../../include/const';
+	require_once __DIR__.'/../../include/php/const';
 
 	function api_fetch(){
 
diff --git a/lib/api/source/sync.php b/lib/api/source/sync.php
index df100ff..f33d8b3 100755
--- a/lib/api/source/sync.php
+++ b/lib/api/source/sync.php
@@ -1,6 +1,6 @@
 <?php
 
-	require_once __DIR__.'/../../include/const';
+	require_once __DIR__.'/../../include/php/const';
 
 	function api_request(){
 
diff --git a/lib/cyclic-hash/source/decr.php b/lib/cyclic-hash/source/decr.php
index 5aaf1a8..df1cb36 100755
--- a/lib/cyclic-hash/source/decr.php
+++ b/lib/cyclic-hash/source/decr.php
@@ -1,6 +1,6 @@
 <?php
 	
-	require_once __DIR__.'/../../include/const';
+	require_once __DIR__.'/../../include/php/const';
 
 
 	/* [1] Function that generates a random secret
diff --git a/lib/cyclic-hash/source/hash.php b/lib/cyclic-hash/source/hash.php
index 4a4b6d0..b50c1c7 100755
--- a/lib/cyclic-hash/source/hash.php
+++ b/lib/cyclic-hash/source/hash.php
@@ -2,7 +2,7 @@
 
 <?php
 
-	require_once __DIR__.'/../../include/const';
+	require_once __DIR__.'/../../include/php/const';
 
 
 	function cyclichash_hash(){
diff --git a/lib/cyclic-hash/source/new.php b/lib/cyclic-hash/source/new.php
index 5b8d030..8f8d18d 100755
--- a/lib/cyclic-hash/source/new.php
+++ b/lib/cyclic-hash/source/new.php
@@ -2,7 +2,7 @@
 
 <?php
 
-	require_once __DIR__.'/../../include/const';
+	require_once __DIR__.'/../../include/php/const';
 
 
 	function cyclichash_new(){
diff --git a/lib/include/bash/const b/lib/include/bash/const
new file mode 100755
index 0000000..4bb64f1
--- /dev/null
+++ b/lib/include/bash/const
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# RESET OUTPUT BUFFER
+
+# MAIN DIRECTORIES
+#export ROOT_DIR="$"/home/sats/satsd;
+export ROOT_DIR="/home/xdrm-brackets/SANDBOX/sats-local";
+export LOG_DIR="$ROOT_DIR/log";
+export DATA_DIR="$ROOT_DIR/data";
+export CONF_DIR="$ROOT_DIR/conf";
+#export SOURCE_DIR="$ROOT_DIR./source";
+export SOURCE_DIR="/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats";
+export TMP_DIR="$ROOT_DIR/tmp";
+
+# CONFIGURATION FILES
+export SECRET_CONF="$CONF_DIR/machine.secret";
+export STATE_CONF="$CONF_DIR/machine.state";
+export BRANCH_CONF="$CONF_DIR/machine.branch";
+export ID_CONF="$CONF_DIR/machine.id";
+export URL_CONF="$CONF_DIR/api.url";
+export AUTH_CONF="$CONF_DIR/auth.list";
+
+# LOG FILES
+export BOOT_LOG="$CONF_DIR/boot.log";
+export DAEMON_LOG="$CONF_DIR/daemon.log";
+export INSTALL_LOG="$CONF_DIR/install-source.log";
+export UPDATE_LOG="$CONF_DIR/update.log";
+
+# DATA FILES
+export ACCESS_DATA="$DATA_DIR/access.data";
+
+# SETTINGS
+export SECRET_SIZE=250;
+
diff --git a/lib/include/bash/func b/lib/include/bash/func
new file mode 100755
index 0000000..ef8fd24
--- /dev/null
+++ b/lib/include/bash/func
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+
+# [1] Launches external script
+####################################################
+# $1 - dependency file
+syscall(){
+	# (1) Check file #
+	test -z $1   && exit;
+	test ! -f $1 && exit;
+
+	# (2) Call and catch output #
+	OUT=$($1);
+
+	# (3) Clean output : remove leading/ending spaces #
+	OUT=$(echo $OUT | tr '\n' '\x' | sed 's/^[ \t\x]*//g' | tr '\x' '\n');
+	OUT=$(echo $OUT | tr '\n' '\x' | sed 's/[ \t\x]*$//g' | tr '\x' '\n');
+
+	# (4) Manage result #
+	return $OUT;
+}
+
+# [2] Log management
+####################################################
+# $1 - error message
+# $2 - feature
+# $3 - flag
+slog(){
+
+	echo $(date +%s)." [$2] $1" >> $LOG_DIR."/$3.log";
+
+}
diff --git a/lib/include/const b/lib/include/php/const
similarity index 91%
rename from lib/include/const
rename to lib/include/php/const
index 481f17e..2fa6f04 100755
--- a/lib/include/const
+++ b/lib/include/php/const
@@ -9,7 +9,7 @@
 	define('DATA_DIR', ROOT_DIR.'/data');
 	define('CONF_DIR', ROOT_DIR.'/conf');
 	#define('SOURCE_DIR', ROOT_DIR.'/source');
-	define('SOURCE_DIR', ROOT_DIR.'/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats');
+	define('SOURCE_DIR', '/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats');
 	define('TMP_DIR', ROOT_DIR.'/tmp');
 
 	# CONFIGURATION FILES
diff --git a/lib/include/func b/lib/include/php/func
similarity index 100%
rename from lib/include/func
rename to lib/include/php/func
diff --git a/lib/mfrc522/source/read.php b/lib/mfrc522/source/read.php
index 48c2b9f..51e0df6 100755
--- a/lib/mfrc522/source/read.php
+++ b/lib/mfrc522/source/read.php
@@ -2,7 +2,7 @@
 
 <?php
 
-	require_once __DIR__.'/../../include/const';
+	require_once __DIR__.'/../../include/php/const';
 
 
 	function mfrc522_read(){
diff --git a/update b/update
index 9b4b218..cbcff81 100755
--- a/update
+++ b/update
@@ -1,14 +1,19 @@
-#!/bin/sh
+#!/bin/bash
+
+__DIR__=$(dirname $(realpath $0));
+
+source $__DIR__/lib/include/bash/const;
+source $__DIR__/lib/include/bash/func;
 
 # [1] Send data + fetch configuration
-/home/sats/satsd/source/lib/api/sync;
+$SOURCE_DIR/lib/api/sync;
 
 test $? -ne 0 && exit 127;
 
 # [2] Update source
-BRANCH=$(cat /home/sats/satsd/conf/machine.branch);
+BRANCH=$(cat $BRANCH_CONF);
 
-cd /home/sats/satsd/source/;
+cd $SOURCE_DIR
 git checkout $BRANCH;
 test $? -ne 0 && exit 127;
 git pull origin $BRANCH;