diff --git a/bin/bootstrap.sh b/bin/bootstrap.sh
index 72bd534..5b3ff2b 100755
--- a/bin/bootstrap.sh
+++ b/bin/bootstrap.sh
@@ -63,6 +63,7 @@ install() {
local ANSIBLE_PACKAGE="$ANSIBLE_COMMAND"
# Load base bash library
+ BIN_HOME=$BIN_PATH
source $BIN_PATH/$LIBRARY/base.lib
# Load bootstrap bash library
@@ -103,9 +104,16 @@ install() {
command_installed $DIALOG_PACKAGE
if [ $? -ne 0 ]
then
- os_pkgs_install $ZIP_PACKAGE
+ os_pkgs_install $DIALOG_PACKAGE
fi
+ # Install zip from OS Packages
+ command_installed $ZIP_PACKAGE
+ if [ $? -ne 0 ]
+ then
+ os_pkgs_install $ZIP_PACKAGE
+ fi
+
# Install sqlite3 from OS Packages
command_installed $SQLITE_COMMAND
if [ $? -ne 0 ]
diff --git a/bin/config/freekeyval.dat b/bin/config/freekeyval.dat
new file mode 100644
index 0000000..6c6a474
--- /dev/null
+++ b/bin/config/freekeyval.dat
@@ -0,0 +1 @@
+https://keyvalue.immanuel.co
diff --git a/bin/config/version b/bin/config/version
new file mode 100644
index 0000000..95fce8c
--- /dev/null
+++ b/bin/config/version
@@ -0,0 +1 @@
+0.98.0
diff --git a/bin/lib/base.lib b/bin/lib/base.lib
index c9b4bd5..c3c5d23 100644
--- a/bin/lib/base.lib
+++ b/bin/lib/base.lib
@@ -18,11 +18,24 @@
# Debería haber recibido una copia de la Licencia Pública Affero General
# junto con este programa. Si no la recibió, consulte .
-DEVS_NAME=config/project.head
+DEVSPATH=${DEVSPATH:=devs}
+CONFPATH=${CONFPATH:=config}
+BIN_BASE=${BIN_BASE:=bin}
+if [ -z "${BIN_HOME}" ]; then
+ BIN_HOME=${HOME}/${DEVSPATH}
+fi
+BIN_CONF=${BIN_CONF:=${BIN_BASE}/config}
+BIN_SOPS=${BIN_SOPS:=${BIN_HOME}/sops}
+BIN_MESG=${BIN_MESG:=${BIN_BASE}/msg}
+BIN_LIBS=${BIN_LIBS:=${BIN_BASE}/lib}
+DEVS_NAME=${CONFPATH}/project.head
GIT_IGNORE=.gitignore
DATENOW="$(date +"%Y-%m-%d %H:%M:%S")"
DATEBAK="$(date +"%Y%m%d%H%M%S")"
+FREEKV_URL=$(cat < "${BIN_HOME}/${BIN_BASE}/${CONFPATH}/freekeyval.dat")
+FREEKV_SOPS_FILE=freekv-sops.devs.yaml
+
DOCKER_LOCAL=dockerfile.local
DOCKER_BASE=dockerfile.base
DOCKER_SAAS=dockerfile.saas
@@ -30,6 +43,8 @@ DOCKER_BUILD=build
DOCKER_FILE=Dockerfile
DOCKER_ENTRY=entrypoint.sh
+VERSION="$(cat < ${BIN_HOME}/${BIN_CONF}/version)"
+
# Test library
function baselib_test() {
echo "Base Library loaded!"
@@ -60,6 +75,7 @@ function display_devstools_header() {
echo "======================================================================"
}
+# Display text header for tui dialog
function display_text_header() {
local head_text=$1
local subhead_text=$2
@@ -376,3 +392,27 @@ function build_container() {
}
+# Get sops token for free remote key/value server
+function sops_freekv_token() {
+
+ local rc=0
+ local sops_file="${BIN_SOPS}/${FREEKV_SOPS_FILE}"
+
+ if [ ! -f "${sops_file}" ]; then
+ return 1
+ fi
+
+ token=$(sops -d ${sops_file} | yq .freekv_devs_token)
+ rc=$?
+ if [ $rc -ne 0 ]; then
+ return $rc
+ fi
+
+ if [ -n "${token}" ]; then
+ return 2
+ fi
+
+ echo "${token}"
+ return 0
+
+}
diff --git a/bin/lib/odoo.lib b/bin/lib/odoo.lib
index 6577f4a..27fc763 100644
--- a/bin/lib/odoo.lib
+++ b/bin/lib/odoo.lib
@@ -19,12 +19,14 @@
# junto con este programa. Si no la recibió, consulte .
ODOO_DEVS=${ODOODEVS:=odoo}
+ODOO_CFGS=${ODOO_CFGS:=configs}
ODOODEVS_PATH="${HOME}/${DEVSPATH:=devs}/${ODOO_DEVS}"
ODOO_REPO_WEB="$(cat ${HOME}/${DEVSPATH:=devs}/bin/config/odoo.repo.2)"
ODOO_REPO_SSH="$(cat ${HOME}/${DEVSPATH:=devs}/bin/config/odoo.repo.1)"
ODOO_REPO_ALT=""
ODOO_REPO_PKG=packs.repos
ODOO_PACK_DEV=packs
+ODOO_VERSION="$(cat < ${ODOODEVS_PATH}/${ODOO_CFGS}/odoo.version)"
ODOO_CFG_VERS=("18")
diff --git a/bin/msg/odoo.es b/bin/msg/odoo.es
index c437d07..a590377 100644
--- a/bin/msg/odoo.es
+++ b/bin/msg/odoo.es
@@ -15,11 +15,14 @@ odmsg_000="(ODOO DEVELOPERS TOOLS)"
odmsg_001="- ODOODEVS TOOLS "
odmsg_002="Ambiente Odoo ya ha sido configurado!"
odmsg_003_1="Uso:"
-odmsg_003_2="[--help] [--version] "
+odmsg_003_2="[--help|-h] [--version|-v] "
+odmsg_003_3=""
odmsg_004="Descripción: Este script permite configurar ambiente para desarrolladores odoo"
+odmsg_004_1="Descripción: Este script crea una carpeta con estructura de proyecto odoo"
odmsg_005="Opciones:"
odmsg_006=" --help Muestra este mensaje de ayuda."
odmsg_007=" --version Muestra la versión del script."
+odmsg_008=" Indica el nombre de la carpeta del proyecto odoo"
odmsg_010="DESCARGAR ODOO ESCOLAR PACK"
odmsg_011="DESCARGAR ODOO BASE PACK"
diff --git a/bin/vpn_install.sh b/bin/vpn_install.sh
index 216384a..5265243 100755
--- a/bin/vpn_install.sh
+++ b/bin/vpn_install.sh
@@ -62,6 +62,7 @@ function install() {
local UPDATE=$5
# Load base bash library
+ BIN_HOME=$BIN_PATH
source $BIN_PATH/$LIBRARY/base.lib
# Load bootstrap bash library