Refactored install scripts

2 files changed, 87 insertions, 2 deletions

diff --git a/lib/_ak_ipfs b/lib/_ak_ipfs
index c2787be..c357f07 100755
--- a/lib/_ak_ipfs
+++ b/lib/_ak_ipfs
@@ -458,7 +458,7 @@ function _ak_ipfs_init(){
 }
 
 function _ak_ipfs_download(){
-    _ak_log_info "Attempting to install IPFS..."
+    _ak_log_info "Figuring latest compatible version of kubo (IPFS)..."
     IPFS_VERSION="$(curl \
         --connect-timeout 3 \
         -s https://dist.ipfs.tech/kubo/versions | tail -1)"
@@ -489,6 +489,43 @@ function _ak_ipfs_download(){
     fi
 }
 
+_ak_ipfs_install(){
+    _ak_log_info "Making temp files"
+    pwd > pwd
+    mktemp -d > tempassin
+    ak_curdir=$(cat pwd)
+    TEMPASSIN=$(cat tempassin)
+    cd $TEMPASSIN
+    tar xf $AK_ARCHIVESDIR/$IPFS_TARGET_FILE
+    cp kubo/ipfs $AK_BINDIR/kubo
+    cd $ak_curdir
+    rm -rf $TEMPASSIN
+    _ak_log_info "ipfs installed on $AK_BINDIR"
+}
+
+function _ak_ipfs_check_and_install(){
+    which kubo > /dev/null 2>&1
+    if [ $? -ne 0 ]
+    then
+        _ak_ipfs_download
+        _ak_ipfs_install
+        _ak_ipfs init
+        _ak_ipfs_swarm_install
+    else
+        _ak_log_info "Found IPFS! Skipping downloading..."
+        _ak_ipfs_swarm_install
+    fi
+    if [ ! -d $AK_IPFS_REPO ]
+    then
+        _ak_ipfs init
+        _ak_ipfs_swarm_install
+    fi
+    if [ ! -f $AK_ZGENESIS ]
+    then
+        _ak_ipfs add -Q $AK_GENESIS > $AK_ZGENESIS
+    fi
+}
+
 function _ak_ipfs_cid_v0_check(){
     if [ -z $1 ] || [ ! -n "$1" ]
     then
diff --git a/lib/_ak_script b/lib/_ak_script
index ee422d5..b0a0785 100755
--- a/lib/_ak_script
+++ b/lib/_ak_script
@@ -140,7 +140,7 @@ function _ak_make_temp_file(){
 }
 
 function _ak_check_and_create_dir(){
-    if [ ! -d "$1" ]
+    if [ ! -z "$1" ] && [ -n "$1" ] && [ ! -d "$1" ]
     then
         mkdir -p "$1"
         if [ $? -eq 0 ]
@@ -170,3 +170,51 @@ function _ak_let_there_be_file(){
         _ak_log_debug "$1 file found"
     fi
 }
+
+function _ak_init_file_as_json_array(){
+    if [ ! -f "$1" ]
+    then
+        printf "[]" > $1
+        if [ $? -eq 0 ]
+        then
+            _ak_log_info "File $1 created!"
+        else
+            _ak_log_error "Problem occured while creating $1"
+            exit 1
+        fi
+    else
+        _ak_log_debug "$1 file found"
+    fi
+}
+
+function _ak_countdown_seconds(){
+    default_countdown=5
+    if [ ! -z "$1" ] && [ -n "$1" ]
+    then
+        if [ "$(echo -n $1 | sed -e 's/^[0-9]*$//g')" == "" ]
+        then
+            countdown=$1
+        else
+            countdown=${default_countdown}
+        fi
+    else
+        countdown=${default_countdown}
+    fi
+    printf " %s" "$countdown"
+    countdown="$(expr $countdown - 1)"
+    sleep 1
+    while [ $countdown -gt 0 ]
+    do
+        if [ $countdown -lt 10 ]
+        then
+            printf "\b\b %s" "$countdown"
+        else
+            printf "\b\b%s" "$countdown"
+        fi
+        countdown="$(expr $countdown - 1)"
+        sleep 1
+    done
+    printf "\b\b starting!!!"
+    sleep 1
+    printf "\n"
+}