fix: use conventions

This commit is contained in:
Strix 2024-06-06 02:10:33 +02:00
parent 243e102b10
commit 65d49fff14
3 changed files with 4 additions and 4 deletions

2
bin/a3
View file

@ -2,7 +2,7 @@
set -e set -e
. ${A3_LIB_PATH:-/usr/lib/a3}/include.sh . ${A3_LIB:-/usr/lib/a3}/include.sh
a3include_lib a3 a3include_lib a3
a3include_lib log a3include_lib log
a3include_lib util a3include_lib util

2
dev
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
export A3_LIB_PATH="./lib" export A3_LIB="./lib"
export A3_INDEX_ROOT="./test/index" export A3_INDEX_ROOT="./test/index"
export A3_INSTALL_BIN_PATH="./test/bin" export A3_INSTALL_BIN_PATH="./test/bin"
export A3_INSTALL_LIB_PATH="./test/lib" export A3_INSTALL_LIB_PATH="./test/lib"

View file

@ -3,7 +3,7 @@
if ! [ $A3_INCLUDE ]; then if ! [ $A3_INCLUDE ]; then
A3_INCLUDE=1 A3_INCLUDE=1
A3_INCLUDED="" A3_INCLUDED=""
A3_LIB_PATH=${A3_LIB_PATH:-/usr/lib/a3} A3_LIB=${A3_LIB:-/usr/lib/a3}
is_included() { is_included() {
echo "$A3_INCLUDED" | grep -q "$1" echo "$A3_INCLUDED" | grep -q "$1"
} }
@ -16,6 +16,6 @@ if ! [ $A3_INCLUDE ]; then
} }
a3include_lib() { a3include_lib() {
include $A3_LIB_PATH/$1.sh include $A3_LIB/$1.sh
} }
fi fi