diff --git a/dist/bes-build b/dist/bes-build index 5935261..303a795 100755 --- a/dist/bes-build +++ b/dist/bes-build @@ -600,7 +600,7 @@ function bes.install () function bes.build () { echo.title "building project" "$APP_NAME" - if [ -d "$APP_DIR/src" ]; then + if [ -d "$APP_DIR/src" ]; then if [ ! -d "$APP_DIR/dist" ]; then echo.action "creating dist directory" mkdir $APP_DIR/dist @@ -620,9 +620,9 @@ function bes.build () # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BES_BOOT= # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -function bes.exists () { +function bes.exists () { declare -f \$1 > /dev/null - #~ [ x\$(type -t \$1) = xfunction ]; + #~ [ x\$(type -t \$1) = xfunction ]; } # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function bes.boot () @@ -666,7 +666,7 @@ function bes.reg () echo.msg " no dependencies, did you forget to run bes-build update ?" fi echo.state 0 - + echo.action "reading ${Coff}src/" for entry in "$APP_DIR/src"/*.sh; do if [ "$(basename $entry)" != "main.sh" ]; then @@ -725,7 +725,7 @@ sep = 80 80 80 err = 194 48 64 val = 255 175 95 key = 40 168 134 -action = 106 183 241 +action = 106 183 241 symbol = 255 175 95 item = 92 147 181 usa = 255 172 0 @@ -743,7 +743,7 @@ meta = 39 100 170" > "$tmp" fi } -BES_LIB="color echo install ini service dep1 dep2" +BES_LIB="color echo install ini service secure dep1 dep2" BES_LOADED_LIB= # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function bes.inlist () @@ -941,11 +941,11 @@ bes.boot # @date 2017-06-16 04:38:52 CET # # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - BES_VERSION=0.11 + BES_VERSION=0.12 BES_NAME="bes-build" BES_URL="https://git.pluie.org/meta-tech/$BES_NAME/raw/latest/dist/$BES_NAME" APP_DIR=$(pwd) - APP_NAME=$(basename $(pwd)) + APP_NAME=$(basename $(pwd)) APP_BIN=$APP_DIR/dist/$APP_NAME # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/build.sh b/src/build.sh index 8c4a491..1353b46 100644 --- a/src/build.sh +++ b/src/build.sh @@ -4,7 +4,7 @@ function bes.build () { echo.title "building project" "$APP_NAME" - if [ -d "$APP_DIR/src" ]; then + if [ -d "$APP_DIR/src" ]; then if [ ! -d "$APP_DIR/dist" ]; then echo.action "creating dist directory" mkdir $APP_DIR/dist @@ -24,9 +24,9 @@ function bes.build () # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BES_BOOT= # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -function bes.exists () { +function bes.exists () { declare -f \$1 > /dev/null - #~ [ x\$(type -t \$1) = xfunction ]; + #~ [ x\$(type -t \$1) = xfunction ]; } # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function bes.boot () @@ -70,7 +70,7 @@ function bes.reg () echo.msg " no dependencies, did you forget to run bes-build update ?" fi echo.state 0 - + echo.action "reading ${Coff}src/" for entry in "$APP_DIR/src"/*.sh; do if [ "$(basename $entry)" != "main.sh" ]; then @@ -129,7 +129,7 @@ sep = 80 80 80 err = 194 48 64 val = 255 175 95 key = 40 168 134 -action = 106 183 241 +action = 106 183 241 symbol = 255 175 95 item = 92 147 181 usa = 255 172 0 diff --git a/src/main.sh b/src/main.sh index ee5a3e6..19b2082 100755 --- a/src/main.sh +++ b/src/main.sh @@ -7,11 +7,11 @@ # @date 2017-06-16 04:38:52 CET # # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - BES_VERSION=0.11 + BES_VERSION=0.12 BES_NAME="bes-build" BES_URL="https://git.pluie.org/meta-tech/$BES_NAME/raw/latest/dist/$BES_NAME" APP_DIR=$(pwd) - APP_NAME=$(basename $(pwd)) + APP_NAME=$(basename $(pwd)) APP_BIN=$APP_DIR/dist/$APP_NAME # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/update.sh b/src/update.sh index a70e0ab..87dc886 100644 --- a/src/update.sh +++ b/src/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -BES_LIB="color echo install ini service dep1 dep2" +BES_LIB="color echo install ini service secure dep1 dep2" BES_LOADED_LIB= # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ function bes.inlist ()