diff --git a/.gitignore b/.gitignore index 063f969..04867ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,13 @@ -auto -common/conf.d/test-odoo.cfg -custom/src/* -!custom/src/.gitkeep -!custom/src/addons.yaml -!custom/src/repos.yaml + datadir .env .env-secret -logfile -migrate-backup -migrate-logfiles -migrate-temporary +.ignore +logfiles +odoo-code *.pyc -.pyenv +*.pyo .slide .venv -waftlib +.venv* +.vscode diff --git a/bootstrap b/bootstrap index d66e9b1..c17a34f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,11 @@ #!/bin/sh +# Version: v.23.08.03 set -e export LIBRARIES_REPOSITORIES='https://github.com/sunflowerit/waftlib.git' -export LIBRARIES_VERSION_BRANCH=${LIBRARIES_VERSION_BRANCH:-v.22.05.30} #versions: v.21.05.10, v.21.09.22, v.22.05.30 +# Libraries version branches: v.21.05.10, v.21.09.22, v.22.05.30, v.23.08.03 +export LIBRARIES_VERSION_BRANCH="${LIBRARIES_VERSION_BRANCH:-v.23.08.03}" ################################################################ ###### ###### @@ -11,15 +13,16 @@ export LIBRARIES_VERSION_BRANCH=${LIBRARIES_VERSION_BRANCH:-v.22.05.30} #version ###### ###### ################################################################ -SCRIPT_PATH=$(cd "$(/usr/bin/dirname "$0")" && /bin/pwd) -ODOO_WORK_DIR=$(cd $SCRIPT_PATH && /bin/pwd) -cd $ODOO_WORK_DIR +SCRIPT_PATH="$(cd "$(/usr/bin/dirname "${0}")" && /bin/pwd)" +ODOO_WORK_DIR="$(cd "${SCRIPT_PATH}" && /bin/pwd)" +cd "${ODOO_WORK_DIR}" -/bin/echo "INFO: Remove exist $ODOO_WORK_DIR/waftlib" -/bin/rm -fr $ODOO_WORK_DIR/waftlib -/bin/echo "INFO: Clone $LIBRARIES_REPOSITORIES to $ODOO_WORK_DIR/waftlib" -/usr/bin/git clone -b $LIBRARIES_VERSION_BRANCH $LIBRARIES_REPOSITORIES $ODOO_WORK_DIR/waftlib 2> /dev/null || \ -/usr/bin/git clone -b master $LIBRARIES_REPOSITORIES $ODOO_WORK_DIR/waftlib +/bin/echo "( INFO ) : Remove exist ${ODOO_WORK_DIR}/.ignore/waftlib" +/bin/rm -fr "${ODOO_WORK_DIR}/.ignore/waftlib" && \ +/bin/mkdir -p "${ODOO_WORK_DIR}/.ignore/waftlib" +/bin/echo "( INFO ) : Clone ${LIBRARIES_REPOSITORIES} to ${ODOO_WORK_DIR}/.ignore/waftlib" +/usr/bin/git clone -b "${LIBRARIES_VERSION_BRANCH}" "${LIBRARIES_REPOSITORIES}" "${ODOO_WORK_DIR}/.ignore/waftlib" 2> /dev/null || \ +/usr/bin/git clone -b master "${LIBRARIES_REPOSITORIES}" "${ODOO_WORK_DIR}/.ignore/waftlib" -/bin/echo "INFO: Run $ODOO_WORK_DIR/waftlib/bootstrap script" -$ODOO_WORK_DIR/waftlib/bootstrap +/bin/echo "( INFO ) : Run ${ODOO_WORK_DIR}/.ignore/waftlib/bootstrap script" +"${ODOO_WORK_DIR}/.ignore/waftlib/bootstrap" diff --git a/custom/src/.gitkeep b/custom/src/.gitkeep deleted file mode 100644 index e69de29..0000000