update migration to meta-tech.academy

README.md

@@ -66,7 +66,7 @@ to use **bes-build** like a dependency manager, you need a `bes.ini` file in you
 
 ```ini  
 [require]
-bes.echo    = 1.1
+bes.echo    = 1.4
 ```
  
 then you can run the `update` command before building
@@ -86,7 +86,7 @@ since version 0.6 you can now add external dependencies :
 
 ```ini  
 [require]
-test.echo   = https://git.pluie.org/meta-tech/bes-echo:master
+test.echo   = https://gitea.meta-tech.academy/meta-tech/bes-echo:master
 ```
 
 
@@ -99,11 +99,14 @@ if you intend to release your lib as a bes dependency you must provide a bes.ini
 [project]
 vendor      = bes
 name        = echo
-version     = 1.1
+version     = 1.4
 license     = "GNU GPL v3"
 author      = a-Sansara
 type        = library
-homepage    = "https://git.pluie.org/meta-tech/bes-echo"
+homepage    = "https://gitea.meta-tech.academy/meta-tech/bes-echo"
 description = "bash bes display utility library"
 keywords    = "bash, bes"
+
+[require]
+bes.color   = 1.4
 ```

bes.ini

@@ -1,13 +1,13 @@
 [project]
 vendor      = bes
 name        = build
-version     = 0.9
+version     = 0.13
 license     = "GNU GPL v3"
 author      = a-Sansara
 type        = application
-homepage    = "https://git.pluie.org/meta-tech/bes-build"
+homepage    = "https://gitea.meta-tech.academy/meta-tech/bes-build"
 description = "bash bes build application for bash programs"
 keywords    = "bash, bes, build"
  
 [require]
-bes.install = 1.2
+bes.install = 1.4

dist/bes-build

@@ -245,7 +245,7 @@ function echo.app ()
     local     msg=${1:-''}
     local version=${2:-''}
     local  author=${3:-'a-Sansara'}
-    local license=${3:-'GNU GPL v3'}
+    local license=${4:-'GNU GPL v3'}
     if [ ! -z "$2" ]; then
         msg="$msg ${Cval}v$version"
     fi
@@ -566,6 +566,7 @@ function bes.install ()
     local  app=${1}
     local  url=${2}
     local path=${3:-/usr/local/bin}
+    local inst=${4:-}
     local done=1
     echo.title "Installing $app ${Coff}in" "$path"
     if [ -z "$app" ] || [ -s "$url" ]; then
@@ -584,6 +585,11 @@ function bes.install ()
         else
             echo.error "install directory do not exists : ${Cspe}$path"
         fi
+        if [ ! -z "$inst" ]; then
+            if bes.exists "$inst"; then
+                $inst
+            fi
+        fi
     else 
         echo.error "can not download latest version of app $app. please check url : $url"
     fi
@@ -598,7 +604,7 @@ function bes.build ()
         if [ ! -d "$APP_DIR/dist" ]; then
             echo.action "creating dist directory"
             mkdir $APP_DIR/dist
-            cho.state $?
+            echo.state $?
         fi
         if [ -f "$APP_BIN" ]; then
             if [ "$1" = "backup" ] || [ "$1" = "-b" ]; then
@@ -685,8 +691,154 @@ bes.boot" >> "$APP_BIN"
         echo.state 1
     fi
 }
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.build.install ()
+{
+    local path="/usr/share/bes/colors.ini"
+    if [ ! -f "$path" ]; then
+        local dir=$(dirname "$path")
+        if [ ! -d "$dir" ]; then
+            echo.action "Creating default bes share dir" "$Cspe$dir$Cofff"
+            sudo mkdir -p "$dir"
+            echo.state $?
+        fi
+        echo.action "Installing default colors file" "$Cspe$path$Cofff"
+        local tmp=$(mktemp)
+        echo "[set]
+#           background    foreground
+#           R   G   B      R   G   B
+head     =  53 114 160    195 223 255
+headsep  =  53 114 160    252 212 102
 
-BES_LIB="color echo install ini dep1 dep2"
+[bg]
+#           background
+#           R   G   B
+done     =  63 172 138
+fail     = 172  63  85
+
+[fg]
+#           foreground
+#           R   G   B
+title    = 133  92 181
+headline =  22  74 133
+sep      =  80  80  80
+err      = 194  48  64
+val      = 255 175  95
+key      =  40 168 134
+action   = 106 183 241
+symbol   = 255 175  95
+item     =  92 147 181
+usa      = 255 172   0
+spe      = 255 214 166
+opt      =  94 215 255
+com      = 175 135 175
+text     =   0 132 101
+meta     =  39 100 170" > "$tmp"
+        sudo mv "$tmp" "$path"
+        echo.state $?
+    else
+        echo.action "Installing default colors file" "$Cspe$path$Cofff"
+        echo.error "file already exists, do not rewrite."
+        echo.state 1
+    fi
+}
+
+function bes.build.new () {
+    local prj=${1}
+    echo.title "creating new project" "$prj"
+    if [ -d "$APP_DIR/$prj" ]; then
+        echo.error "directory $prj already exists" 1
+    else
+        echo.action "creating directory" "$prj" "*" "Cusa"
+        mkdir "$APP_DIR/$prj"
+        echo.state $?
+        echo.action "creating project config file" "bes.ini" "*" "Cusa"
+        echo -e "[project]
+vendor      = 
+name        = $prj
+version     = 0.1
+license     = \"GNU GPL v3\"
+author      = 
+type        = application
+homepage    = 
+description = \"bash bes $prj application\"
+keywords    = \"bash $prj\"
+
+[require]
+bes.install = 1.4
+" > "$APP_DIR/$prj/bes.ini"
+        echo.state $?
+        echo.action "Creating directory" "src" "*" "Cusa"
+        mkdir $APP_DIR/$prj/src
+        echo.state $?
+        echo.action "Adding default templates" "main" "*" "Cusa"
+        echo "#!/bin/bash
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      BES_VERSION=0.1
+       BES_AUTHOR=me
+      BES_LICENSE=MIT
+         BES_NAME=\"$prj\"
+          BES_URL=\"https://your.forge.git/vendor/\$BES_NAME/raw/latest/dist/\$BES_NAME\"
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function $prj.main ()
+{
+    echo.msg \"hello bes\" \"\$Citem\"
+    echo.rs \$?
+    echo
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.main ()
+{
+    if   [ \"\$1\" = \"version\" ] || [ \"\$1\" = \"-v\" ]; then
+        echo \$BES_VERSION
+    else
+        echo.app \"\$BES_NAME\" \"\$BES_VERSION\" \"\$BES_AUTHOR\" \"\$BES_LICENSE\"
+        echo
+        if   [ \"\$1\" = \"install\" ] || [ \"\$1\" = \"-i\" ]; then
+            bes.install \"\$BES_NAME\" \"\$BES_URL\" \"\$2\"
+        elif [ \"\$1\" = \"help\" ] || [ \"\$1\" = \"-h\" ]; then
+            $prj.usage
+        else
+            $prj.main
+        fi
+        echo
+    fi
+}
+bes.main \$*
+" > "$APP_DIR/$prj/src/main.sh"
+        echo.state $?
+        echo.action "Adding default template" "usage" "*" "Cusa"
+echo "#!/bin/bash
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function $prj.usage ()
+{
+    echo -e \"     \${Cusa}Usage :\${Coff}\n
+    \${Ccom}\tInstall or update \$BES_NAME on specified BINDIR directory or in /usr/local/bin directory
+    \${Cspe}\t\$BES_NAME  \${Copt}-i\${Ctext}, \${Copt}install        \${Copt}[ \${Ctext}BINDIR\${Copt} ]
+    \${Ccom}\tDisplay program version
+    \${Cspe}\t\$BES_NAME  \${Copt}-v\${Ctext}, \${Copt}version
+    \${Ccom}\tDisplay this help
+    \${Cspe}\t\$BES_NAME  \${Copt}-h\${Ctext}, \${Copt}help\"
+
+    echo -e \"${Coff}\"
+}
+
+" > "$APP_DIR/$prj/src/usage.sh"
+        echo.state $?
+        echo.rs $?
+        echo
+    fi
+}
+
+function bes.build.require () {
+    local dep=${1}
+    echo.msg "coming soon"
+    echo.rs 1
+}
+
+BES_LIB="color echo install ini service secure dep1 dep2"
 BES_LOADED_LIB=
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function bes.inlist ()
@@ -776,7 +928,7 @@ function bes.loadDep ()
                 cd "$APP_DIR/vendor/$vendor"
                 echo.action "updating repository $Cusa$vendor.$project ${Coff}:$Cusa $version"
                 if [ ! -d "$project" ]; then
-                    git clone -q "https://git.pluie.org/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
+                    git clone -q "https://gitea.meta-tech.academy/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
                     #~ echo.state $?
                     cd $project
                 else
@@ -861,16 +1013,20 @@ function bes.update ()
 function bes.usage ()
 {
     echo -e "     ${Cusa}Usage :${Coff}\n
+    ${Ccom}\tCreate new bes project
+    ${Cspe}\t$BES_NAME  ${Copt}-n${Ctext}, ${Copt}new            ${Copt}[ ${Ctext}PROJECT_NAME${Copt} ]
+    ${Ccom}\tUpdate current project dependencies
+    ${Cspe}\t$BES_NAME  ${Copt}-u${Ctext}, ${Copt}update
     ${Ccom}\tBuild current project (overwrite existing build)
-    ${Cspe}\t$APP_NAME  ${Copt}
+    ${Cspe}\t$BES_NAME  ${Copt}
     ${Ccom}\tBuild current project and backup existing build
-    ${Cspe}\t$APP_NAME  ${Copt}-b${Ctext}, ${Copt}backup
+    ${Cspe}\t$BES_NAME  ${Copt}-b${Ctext}, ${Copt}backup
     ${Ccom}\tInstall or update $APP_NAME on specified BINDIR directory or in /usr/local/bin directory
-    ${Cspe}\t$APP_NAME  ${Copt}-i${Ctext}, ${Copt}install        ${Copt}[ ${Ctext}BINDIR${Copt} ]
+    ${Cspe}\t$BES_NAME  ${Copt}-i${Ctext}, ${Copt}install        ${Copt}[ ${Ctext}BINDIR${Copt} ]
     ${Ccom}\tDisplay program version
-    ${Cspe}\t$APP_NAME  ${Copt}-v${Ctext}, ${Copt}version
+    ${Cspe}\t$BES_NAME  ${Copt}-v${Ctext}, ${Copt}version
     ${Ccom}\tDisplay this help
-    ${Cspe}\t$APP_NAME  ${Copt}-h${Ctext}, ${Copt}help"
+    ${Cspe}\t$BES_NAME  ${Copt}-h${Ctext}, ${Copt}help"
 
     echo -e "${Coff}"
 }
@@ -878,15 +1034,15 @@ function bes.usage ()
 bes.boot
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
-# @author   a-Sansara - https://git.pluie.org/meta-tech/bes-build
+# @author   a-Sansara - https://gitea.meta-tech.academy/meta-tech/bes-build
 # @app      bes-build
 # @license  GNU GPL v3
 # @date     2017-06-16 04:38:52 CET
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      BES_VERSION=0.9
+      BES_VERSION=0.13
          BES_NAME="bes-build"
-          BES_URL="https://git.pluie.org/meta-tech/$BES_NAME/raw/latest/dist/$BES_NAME"
+          BES_URL="https://gitea.meta-tech.academy/meta-tech/$BES_NAME/raw/latest/dist/$BES_NAME"
           APP_DIR=$(pwd)
          APP_NAME=$(basename $(pwd))
           APP_BIN=$APP_DIR/dist/$APP_NAME
@@ -899,15 +1055,31 @@ function bes.main ()
     else
         echo.app "$BES_NAME" "$BES_VERSION"
         echo
+        enusage=0
         if   [ "$1" = "install" ] || [ "$1" = "-i" ]; then
-            bes.install "$BES_NAME" "$BES_URL" "$2"
+            bes.install "$BES_NAME" "$BES_URL" "$2" "bes.build.install"
         elif [ "$1" = "help" ] || [ "$1" = "-h" ]; then
-            bes.usage
+            enusage=1
         elif [ "$1" = "update" ] || [ "$1" = "-u" ]; then
             bes.update
+        elif [ "$1" = "new" ] || [ "$1" = "-n" ]; then
+            if [ ! -z "$2" ]; then
+                bes.build.new $2
+            else
+                enusage=1
+            fi
+        elif [ "$1" = "require" ] || [ "$1" = "-r" ]; then
+            if [ ! -z "$2" ]; then
+                bes.build.require $2
+            else
+                enusage=1
+            fi
         elif [ -z "$1" ] || [ "$1" = "backup" ] || [ "$1" = "-b" ]; then
             bes.build "$1"
         fi
+        if [ "$enusage" = "1" ]; then
+            bes.usage
+        fi
         echo
     fi
 }

src/build.sh

@@ -8,7 +8,7 @@ function bes.build ()
         if [ ! -d "$APP_DIR/dist" ]; then
             echo.action "creating dist directory"
             mkdir $APP_DIR/dist
-            cho.state $?
+            echo.state $?
         fi
         if [ -f "$APP_BIN" ]; then
             if [ "$1" = "backup" ] || [ "$1" = "-b" ]; then
@@ -95,3 +95,54 @@ bes.boot" >> "$APP_BIN"
         echo.state 1
     fi
 }
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.build.install ()
+{
+    local path="/usr/share/bes/colors.ini"
+    if [ ! -f "$path" ]; then
+        local dir=$(dirname "$path")
+        if [ ! -d "$dir" ]; then
+            echo.action "Creating default bes share dir" "$Cspe$dir$Cofff"
+            sudo mkdir -p "$dir"
+            echo.state $?
+        fi
+        echo.action "Installing default colors file" "$Cspe$path$Cofff"
+        local tmp=$(mktemp)
+        echo "[set]
+#           background    foreground
+#           R   G   B      R   G   B
+head     =  53 114 160    195 223 255
+headsep  =  53 114 160    252 212 102
+
+[bg]
+#           background
+#           R   G   B
+done     =  63 172 138
+fail     = 172  63  85
+
+[fg]
+#           foreground
+#           R   G   B
+title    = 133  92 181
+headline =  22  74 133
+sep      =  80  80  80
+err      = 194  48  64
+val      = 255 175  95
+key      =  40 168 134
+action   = 106 183 241
+symbol   = 255 175  95
+item     =  92 147 181
+usa      = 255 172   0
+spe      = 255 214 166
+opt      =  94 215 255
+com      = 175 135 175
+text     =   0 132 101
+meta     =  39 100 170" > "$tmp"
+        sudo mv "$tmp" "$path"
+        echo.state $?
+    else
+        echo.action "Installing default colors file" "$Cspe$path$Cofff"
+        echo.error "file already exists, do not rewrite."
+        echo.state 1
+    fi
+}

src/main.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
-# @author   a-Sansara - https://git.pluie.org/meta-tech/bes-build
+# @author   a-Sansara - https://gitea.meta-tech.academy/meta-tech/bes-build
 # @app      bes-build
 # @license  GNU GPL v3
 # @date     2017-06-16 04:38:52 CET
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      BES_VERSION=0.9
+      BES_VERSION=0.13
          BES_NAME="bes-build"
-          BES_URL="https://git.pluie.org/meta-tech/$BES_NAME/raw/latest/dist/$BES_NAME"
+          BES_URL="https://gitea.meta-tech.academy/meta-tech/$BES_NAME/raw/latest/dist/$BES_NAME"
           APP_DIR=$(pwd)
          APP_NAME=$(basename $(pwd))
           APP_BIN=$APP_DIR/dist/$APP_NAME
@@ -22,15 +22,31 @@ function bes.main ()
     else
         echo.app "$BES_NAME" "$BES_VERSION"
         echo
+        enusage=0
         if   [ "$1" = "install" ] || [ "$1" = "-i" ]; then
-            bes.install "$BES_NAME" "$BES_URL" "$2"
+            bes.install "$BES_NAME" "$BES_URL" "$2" "bes.build.install"
         elif [ "$1" = "help" ] || [ "$1" = "-h" ]; then
-            bes.usage
+            enusage=1
         elif [ "$1" = "update" ] || [ "$1" = "-u" ]; then
             bes.update
+        elif [ "$1" = "new" ] || [ "$1" = "-n" ]; then
+            if [ ! -z "$2" ]; then
+                bes.build.new $2
+            else
+                enusage=1
+            fi
+        elif [ "$1" = "require" ] || [ "$1" = "-r" ]; then
+            if [ ! -z "$2" ]; then
+                bes.build.require $2
+            else
+                enusage=1
+            fi
         elif [ -z "$1" ] || [ "$1" = "backup" ] || [ "$1" = "-b" ]; then
             bes.build "$1"
         fi
+        if [ "$enusage" = "1" ]; then
+            bes.usage
+        fi
         echo
     fi
 }

src/new.sh

@@ -0,0 +1,90 @@
+#!/bin/bash
+
+function bes.build.new () {
+    local prj=${1}
+    echo.title "creating new project" "$prj"
+    if [ -d "$APP_DIR/$prj" ]; then
+        echo.error "directory $prj already exists" 1
+    else
+        echo.action "creating directory" "$prj" "*" "Cusa"
+        mkdir "$APP_DIR/$prj"
+        echo.state $?
+        echo.action "creating project config file" "bes.ini" "*" "Cusa"
+        echo -e "[project]
+vendor      = 
+name        = $prj
+version     = 0.1
+license     = \"GNU GPL v3\"
+author      = 
+type        = application
+homepage    = 
+description = \"bash bes $prj application\"
+keywords    = \"bash $prj\"
+
+[require]
+bes.install = 1.4
+" > "$APP_DIR/$prj/bes.ini"
+        echo.state $?
+        echo.action "Creating directory" "src" "*" "Cusa"
+        mkdir $APP_DIR/$prj/src
+        echo.state $?
+        echo.action "Adding default templates" "main" "*" "Cusa"
+        echo "#!/bin/bash
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      BES_VERSION=0.1
+       BES_AUTHOR=me
+      BES_LICENSE=MIT
+         BES_NAME=\"$prj\"
+          BES_URL=\"https://your.forge.git/vendor/\$BES_NAME/raw/latest/dist/\$BES_NAME\"
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function $prj.main ()
+{
+    echo.msg \"hello bes\" \"\$Citem\"
+    echo.rs \$?
+    echo
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.main ()
+{
+    if   [ \"\$1\" = \"version\" ] || [ \"\$1\" = \"-v\" ]; then
+        echo \$BES_VERSION
+    else
+        echo.app \"\$BES_NAME\" \"\$BES_VERSION\" \"\$BES_AUTHOR\" \"\$BES_LICENSE\"
+        echo
+        if   [ \"\$1\" = \"install\" ] || [ \"\$1\" = \"-i\" ]; then
+            bes.install \"\$BES_NAME\" \"\$BES_URL\" \"\$2\"
+        elif [ \"\$1\" = \"help\" ] || [ \"\$1\" = \"-h\" ]; then
+            $prj.usage
+        else
+            $prj.main
+        fi
+        echo
+    fi
+}
+bes.main \$*
+" > "$APP_DIR/$prj/src/main.sh"
+        echo.state $?
+        echo.action "Adding default template" "usage" "*" "Cusa"
+echo "#!/bin/bash
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function $prj.usage ()
+{
+    echo -e \"     \${Cusa}Usage :\${Coff}\n
+    \${Ccom}\tInstall or update \$BES_NAME on specified BINDIR directory or in /usr/local/bin directory
+    \${Cspe}\t\$BES_NAME  \${Copt}-i\${Ctext}, \${Copt}install        \${Copt}[ \${Ctext}BINDIR\${Copt} ]
+    \${Ccom}\tDisplay program version
+    \${Cspe}\t\$BES_NAME  \${Copt}-v\${Ctext}, \${Copt}version
+    \${Ccom}\tDisplay this help
+    \${Cspe}\t\$BES_NAME  \${Copt}-h\${Ctext}, \${Copt}help\"
+
+    echo -e \"${Coff}\"
+}
+
+" > "$APP_DIR/$prj/src/usage.sh"
+        echo.state $?
+        echo.rs $?
+        echo
+    fi
+}

src/require.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+function bes.build.require () {
+    local dep=${1}
+    echo.msg "coming soon"
+    echo.rs 1
+}

src/update.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BES_LIB="color echo install ini dep1 dep2"
+BES_LIB="color echo install ini service secure dep1 dep2"
 BES_LOADED_LIB=
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function bes.inlist ()
@@ -90,7 +90,7 @@ function bes.loadDep ()
                 cd "$APP_DIR/vendor/$vendor"
                 echo.action "updating repository $Cusa$vendor.$project ${Coff}:$Cusa $version"
                 if [ ! -d "$project" ]; then
-                    git clone -q "https://git.pluie.org/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
+                    git clone -q "https://gitea.meta-tech.academy/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
                     #~ echo.state $?
                     cd $project
                 else

src/usage.sh

@@ -4,16 +4,20 @@
 function bes.usage ()
 {
     echo -e "     ${Cusa}Usage :${Coff}\n
+    ${Ccom}\tCreate new bes project
+    ${Cspe}\t$BES_NAME  ${Copt}-n${Ctext}, ${Copt}new            ${Copt}[ ${Ctext}PROJECT_NAME${Copt} ]
+    ${Ccom}\tUpdate current project dependencies
+    ${Cspe}\t$BES_NAME  ${Copt}-u${Ctext}, ${Copt}update
     ${Ccom}\tBuild current project (overwrite existing build)
-    ${Cspe}\t$APP_NAME  ${Copt}
+    ${Cspe}\t$BES_NAME  ${Copt}
     ${Ccom}\tBuild current project and backup existing build
-    ${Cspe}\t$APP_NAME  ${Copt}-b${Ctext}, ${Copt}backup
+    ${Cspe}\t$BES_NAME  ${Copt}-b${Ctext}, ${Copt}backup
     ${Ccom}\tInstall or update $APP_NAME on specified BINDIR directory or in /usr/local/bin directory
-    ${Cspe}\t$APP_NAME  ${Copt}-i${Ctext}, ${Copt}install        ${Copt}[ ${Ctext}BINDIR${Copt} ]
+    ${Cspe}\t$BES_NAME  ${Copt}-i${Ctext}, ${Copt}install        ${Copt}[ ${Ctext}BINDIR${Copt} ]
     ${Ccom}\tDisplay program version
-    ${Cspe}\t$APP_NAME  ${Copt}-v${Ctext}, ${Copt}version
+    ${Cspe}\t$BES_NAME  ${Copt}-v${Ctext}, ${Copt}version
     ${Ccom}\tDisplay this help
-    ${Cspe}\t$APP_NAME  ${Copt}-h${Ctext}, ${Copt}help"
+    ${Cspe}\t$BES_NAME  ${Copt}-h${Ctext}, ${Copt}help"
 
     echo -e "${Coff}"
 }