From 5fcea7dc9b9bce4c318cdb13aba418bccda08a67 Mon Sep 17 00:00:00 2001
From: a-sansara <dev@pluie.org>
Date: Sun, 30 Apr 2017 02:16:30 +0200
Subject: [PATCH] adding build.sh

---
 dist/bes-build | 118 ++++++++++++++++++++++++++++---------------------
 src/build.sh   |  37 ++++++++++++++++
 src/main.sh    |  47 ++++----------------
 3 files changed, 113 insertions(+), 89 deletions(-)
 create mode 100644 src/build.sh

diff --git a/dist/bes-build b/dist/bes-build
index 719b94d..35bc2e7 100755
--- a/dist/bes-build
+++ b/dist/bes-build
@@ -1,18 +1,56 @@
 #!/bin/bash
 
+bes.build(){
+    bes.echo.title "building project" "$APP_NAME"
+    if [ -d "$APP_DIR/src" ]; then 
+        if [ ! -d "$APP_DIR/dist" ]; then
+            bes.echo.action "creating dist directory"
+            mkdir $APP_DIR/dist
+            bes.echo.state $?
+        fi
+        if [ -f "$APP_BIN" ]; then
+            bes.echo.action "removing ${Coff}dist/$APP_NAME${Coff}"
+            rm $APP_BIN
+            bes.echo.state $?
+        fi
+        echo "#!/bin/bash" > $APP_BIN
+        bes.echo.action "reading ${Coff}src/"
+        for entry in "$APP_DIR/src"/*.sh; do
+            if [ "$(basename $entry)" != "main.sh" ]; then
+                bes.echo "      - appending ${Coff}src/$(basename $entry)"
+                tail -n +2 "$entry" >> "$APP_BIN"
+            fi
+        done
+        if [ -f "$APP_DIR/src/main.sh" ]; then
+            tail -n +2 "$APP_DIR/src/main.sh" >> "$APP_BIN"
+            bes.echo "      - appending ${Coff}src/main.sh"
+        fi
+        bes.echo.state 0
+        bes.echo.action "set execution mode"
+        chmod +x $APP_BIN
+        bes.echo.state $?
+    else
+        bes.echo.error "no src/ directory. exit"
+        bes.echo.state 1
+    fi
+    echo
+}
+
 BES_TERM_WIDTH=105
    BES_NOCOLOR=0
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 if [ "$BES_NOCOLOR" -eq 0 ]; then
-             Cok="\033[0;38;5;37m";            Cko="\033[0;38;5;217m"
-            Coff="\033[m";                  Ctitle="\033[1;48;5;23;1;38;5;15m"
-            Cspe="\033[1;38;5;223m";         Citem="\033[1;38;5;214m"
-            Cval="\033[1;38;5;215m";          Cusa="\033[1;38;5;214m"
-            Cbra="\033[1;38;5;203m";         Crepo="\033[1;38;5;223m"
-           Cmeta="\033[1;38;5;30m";          Ctext="\033[1;38;5;30m"
-            Copt="\033[1;38;5;81m";           Csep="\033[1;38;5;241m"
-            Cerr="\033[1;38;5;196m";          Ccom="\033[0;38;5;139m"
+             Cok="\033[0;38;5;37m";              Cko="\033[0;38;5;217m"
+            Coff="\033[m";                    Ctitle="\033[1;48;5;23;1;38;5;15m"
+           Cdone="\033[1;48;5;36;1;38;5;15m";  Cfail="\033[1;48;5;196;1;38;5;15m"
+            Cspe="\033[1;38;5;223m";           Citem="\033[1;38;5;214m"
+            Cval="\033[1;38;5;215m";            Cusa="\033[1;38;5;214m"
+            Cbra="\033[1;38;5;203m";           Crepo="\033[1;38;5;223m"
+           Cmeta="\033[1;38;5;30m";            Ctext="\033[1;38;5;30m"
+            Copt="\033[1;38;5;81m";             Csep="\033[1;38;5;241m"
+            Cerr="\033[1;38;5;196m";            Ccom="\033[0;38;5;139m"
+        Csection="\033[1;38;5;97m";
 fi
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 bes.echo(){
@@ -40,6 +78,11 @@ bes.echo.action(){
     bes.echo "$1" 1
 }
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bes.echo.title(){
+    bes.echo " ${Cspe}☪ ${Csection}$1 ${Copt}$2${Coff}"
+    echo
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 bes.echo.keyval(){
     local c=': '
     if [ ! "$BES_NOCOLOR" = 1 ]; then
@@ -49,10 +92,12 @@ bes.echo.keyval(){
 }
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 bes.echo.state(){
+    local len=8
+    printf "%0.s " $(seq 1 $(($BES_TERM_WIDTH-${len})))
     if [ "$1" = 0 ]; then
-        echo "      done !"
+        echo -e "${Cdone}  OK  ${Coff}"
     else
-        echo "      fail !"
+        echo -e "${Cfail}  KO  ${Coff}"
     fi
 }
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -84,45 +129,18 @@ bes.title(){
 }
 
 BES_BUILD_VERSION=0.2
+          APP_DIR=$(pwd)
+         APP_NAME=$(basename $(pwd)) 
+          APP_BIN=$APP_DIR/dist/$APP_NAME
 
-bes.title 'bes-build' $BES_BUILD_VERSION
+bes.main(){
+    bes.title 'bes-build' $BES_BUILD_VERSION
+    echo
+    if   [ "$1" = "install" ]; then
+        bes.install
+    elif [ -z "$1" ]; then
+        bes.build "$1"
+    fi
+}
 
-  APP_DIR=$(pwd)
- APP_NAME=$(basename $(pwd)) 
-  APP_BIN=$APP_DIR/dist/$APP_NAME
-
-echo
-bes.echo " ${Cspe}building project ${Copt}$APP_NAME${Coff}" 0
-echo
-if [ -d "$APP_DIR/src" ]; then 
-    if [ ! -d "$APP_DIR/dist" ]; then
-        bes.echo.action "creating dist directory"
-        mkdir $APP_DIR/dist
-        bes.echo.state $?
-    fi
-    if [ -f "$APP_BIN" ]; then
-        bes.echo.action "removing ${Coff}dist/$APP_NAME${Coff}"
-        rm $APP_BIN
-        bes.echo.state $?
-    fi
-    echo "#!/bin/bash" > $APP_BIN
-    bes.echo.action "reading ${Coff}src/"
-    for entry in "$APP_DIR/src"/*.sh; do
-        if [ "$(basename $entry)" != "main.sh" ]; then
-            bes.echo "      - appending ${Coff}src/$(basename $entry)"
-            tail -n +2 "$entry" >> "$APP_BIN"
-        fi
-    done
-    if [ -f "$APP_DIR/src/main.sh" ]; then
-        tail -n +2 "$APP_DIR/src/main.sh" >> "$APP_BIN"
-        bes.echo "      - appending ${Coff}src/main.sh"
-    fi
-    bes.echo.state 0
-    bes.echo.action "set execution mode"
-    chmod +x $APP_BIN
-    bes.echo.state $?
-else
-    bes.echo.error "no src/ directory. exit"
-    bes.echo.state 1
-fi
-echo
+bes.main $*
diff --git a/src/build.sh b/src/build.sh
new file mode 100644
index 0000000..9071834
--- /dev/null
+++ b/src/build.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+bes.build(){
+    bes.echo.title "building project" "$APP_NAME"
+    if [ -d "$APP_DIR/src" ]; then 
+        if [ ! -d "$APP_DIR/dist" ]; then
+            bes.echo.action "creating dist directory"
+            mkdir $APP_DIR/dist
+            bes.echo.state $?
+        fi
+        if [ -f "$APP_BIN" ]; then
+            bes.echo.action "removing ${Coff}dist/$APP_NAME${Coff}"
+            rm $APP_BIN
+            bes.echo.state $?
+        fi
+        echo "#!/bin/bash" > $APP_BIN
+        bes.echo.action "reading ${Coff}src/"
+        for entry in "$APP_DIR/src"/*.sh; do
+            if [ "$(basename $entry)" != "main.sh" ]; then
+                bes.echo "      - appending ${Coff}src/$(basename $entry)"
+                tail -n +2 "$entry" >> "$APP_BIN"
+            fi
+        done
+        if [ -f "$APP_DIR/src/main.sh" ]; then
+            tail -n +2 "$APP_DIR/src/main.sh" >> "$APP_BIN"
+            bes.echo "      - appending ${Coff}src/main.sh"
+        fi
+        bes.echo.state 0
+        bes.echo.action "set execution mode"
+        chmod +x $APP_BIN
+        bes.echo.state $?
+    else
+        bes.echo.error "no src/ directory. exit"
+        bes.echo.state 1
+    fi
+    echo
+}
diff --git a/src/main.sh b/src/main.sh
index 68d083e..f614990 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -1,49 +1,18 @@
 #!/bin/bash
 
 BES_BUILD_VERSION=0.2
-
-bes.title 'bes-build' $BES_BUILD_VERSION
-
-  APP_DIR=$(pwd)
- APP_NAME=$(basename $(pwd)) 
-  APP_BIN=$APP_DIR/dist/$APP_NAME
+          APP_DIR=$(pwd)
+         APP_NAME=$(basename $(pwd)) 
+          APP_BIN=$APP_DIR/dist/$APP_NAME
 
 bes.main(){
-
+    bes.title 'bes-build' $BES_BUILD_VERSION
     echo
-    bes.echo.title "building project" "$APP_NAME"
-    if [ -d "$APP_DIR/src" ]; then 
-        if [ ! -d "$APP_DIR/dist" ]; then
-            bes.echo.action "creating dist directory"
-            mkdir $APP_DIR/dist
-            bes.echo.state $?
-        fi
-        if [ -f "$APP_BIN" ]; then
-            bes.echo.action "removing ${Coff}dist/$APP_NAME${Coff}"
-            rm $APP_BIN
-            bes.echo.state $?
-        fi
-        echo "#!/bin/bash" > $APP_BIN
-        bes.echo.action "reading ${Coff}src/"
-        for entry in "$APP_DIR/src"/*.sh; do
-            if [ "$(basename $entry)" != "main.sh" ]; then
-                bes.echo "      - appending ${Coff}src/$(basename $entry)"
-                tail -n +2 "$entry" >> "$APP_BIN"
-            fi
-        done
-        if [ -f "$APP_DIR/src/main.sh" ]; then
-            tail -n +2 "$APP_DIR/src/main.sh" >> "$APP_BIN"
-            bes.echo "      - appending ${Coff}src/main.sh"
-        fi
-        bes.echo.state 0
-        bes.echo.action "set execution mode"
-        chmod +x $APP_BIN
-        bes.echo.state $?
-    else
-        bes.echo.error "no src/ directory. exit"
-        bes.echo.state 1
+    if   [ "$1" = "install" ]; then
+        bes.install
+    elif [ -z "$1" ]; then
+        bes.build "$1"
     fi
-    echo
 }
 
 bes.main $*