octoleo/octojpack
3
3
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds local . file config options

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2021-06-08 08:36:01 +02:00
parent aa0ea266a4
commit 8d6bee7144
Signed by: Llewellyn
GPG Key ID: EFC0C720A240551C
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/.gitignore vendored
View File

@ -1,4 +1,5 @@
conf.json conf.json
packager packager
licenses licenses
.octojpack
.env .env

10
src/octojpack
View File

@ -3,7 +3,7 @@
# Program name # Program name
PROGRAM_NAME="Octojpack" PROGRAM_NAME="Octojpack"
PROGRAM_CODE="octojpack" PROGRAM_CODE="octojpack"
PROGRAM_VERSION="1.0.0" PROGRAM_VERSION="1.0.1"
PROGRAM_V="1.0" PROGRAM_V="1.0"
PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}" PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}"
@ -1055,9 +1055,13 @@ tmp_path="/home/$USER/${PROGRAM_CODE}"
PACKAGE_DIR="${PACKAGE_DIR:-$tmp_path}" PACKAGE_DIR="${PACKAGE_DIR:-$tmp_path}"
# we set the licenses directory # we set the licenses directory
tmp_path="/home/$USER/${PROGRAM_CODE}/licenses" tmp_path="/home/$USER/${PROGRAM_CODE}/licenses"
# if path not set try $PWD path
[ -d "$tmp_path" ] || tmp_path="$PWD"
LICENSE_DIR="${LICENSE_DIR:-$tmp_path}" LICENSE_DIR="${LICENSE_DIR:-$tmp_path}"
# the environment variables path # the environment variables path
tmp_path="/home/$USER/.config/${PROGRAM_CODE}/.env" tmp_path="/home/$USER/.config/${PROGRAM_CODE}/.env"
# if path not set try $PWD path
[ -f "$tmp_path" ] || tmp_path="$PWD/.env"
VDM_ENV_FILE_PATH="${VDM_ENV_FILE_PATH:-$tmp_path}" VDM_ENV_FILE_PATH="${VDM_ENV_FILE_PATH:-$tmp_path}"
# car this tmp out # car this tmp out
unset tmp_path unset tmp_path
@ -1205,6 +1209,10 @@ done
# shellcheck disable=SC1090 # shellcheck disable=SC1090
[ -f "${VDM_ENV_FILE_PATH}" ] && source "${VDM_ENV_FILE_PATH}" [ -f "${VDM_ENV_FILE_PATH}" ] && source "${VDM_ENV_FILE_PATH}"
# if path not set try $PWD path (so you can open a folder that has .octojpack file and it will be loaded)
tmp_path="$PWD/.${PROGRAM_CODE}"
VDM_PACKAGE_CONF_FILE="${VDM_PACKAGE_CONF_FILE:-$tmp_path}"
# check if the config is passed via a URL # check if the config is passed via a URL
if [[ "${VDM_PACKAGE_CONF_FILE}" =~ ^"http:" ]] || [[ "${VDM_PACKAGE_CONF_FILE}" =~ ^"https:" ]]; then if [[ "${VDM_PACKAGE_CONF_FILE}" =~ ^"http:" ]] || [[ "${VDM_PACKAGE_CONF_FILE}" =~ ^"https:" ]]; then
# shellcheck disable=SC2143 # shellcheck disable=SC2143