From 65d49fff146a8b1c9a68ceb17ec8329dcd0d78d6 Mon Sep 17 00:00:00 2001 From: Strix Date: Thu, 6 Jun 2024 02:10:33 +0200 Subject: [PATCH] fix: use conventions --- bin/a3 | 2 +- dev | 2 +- lib/include.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/a3 b/bin/a3 index 32ecc48..795811f 100755 --- a/bin/a3 +++ b/bin/a3 @@ -2,7 +2,7 @@ set -e -. ${A3_LIB_PATH:-/usr/lib/a3}/include.sh +. ${A3_LIB:-/usr/lib/a3}/include.sh a3include_lib a3 a3include_lib log a3include_lib util diff --git a/dev b/dev index ae36feb..fd1bf80 100755 --- a/dev +++ b/dev @@ -1,6 +1,6 @@ #!/bin/sh -export A3_LIB_PATH="./lib" +export A3_LIB="./lib" export A3_INDEX_ROOT="./test/index" export A3_INSTALL_BIN_PATH="./test/bin" export A3_INSTALL_LIB_PATH="./test/lib" diff --git a/lib/include.sh b/lib/include.sh index 8de9ac1..1a3389b 100644 --- a/lib/include.sh +++ b/lib/include.sh @@ -3,7 +3,7 @@ if ! [ $A3_INCLUDE ]; then A3_INCLUDE=1 A3_INCLUDED="" - A3_LIB_PATH=${A3_LIB_PATH:-/usr/lib/a3} + A3_LIB=${A3_LIB:-/usr/lib/a3} is_included() { echo "$A3_INCLUDED" | grep -q "$1" } @@ -16,6 +16,6 @@ if ! [ $A3_INCLUDE ]; then } a3include_lib() { - include $A3_LIB_PATH/$1.sh + include $A3_LIB/$1.sh } fi \ No newline at end of file