From c9f957a0807027ce17f0fcf394dbb7708e5adadc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Aug 2024 19:08:42 +0300
Subject: apkg: add logging

---
 apkg | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'apkg')

diff --git a/apkg b/apkg
index d596b7e..4e7c863 100755
--- a/apkg
+++ b/apkg
@@ -745,15 +745,17 @@ options:
   -s <pattern> search packages
   -h           print this help message
   
-environments:
+environment variables:
   APKG_ROOT          override default root (${APKG_ROOT:-/}) location
   APKG_CONF          override default $APKG_CONF location
+  APKG_NOPROMPT		 set the variable for non-interactive use
+  APKG_LOG			 set the variable for logging the output to a file
   
 EOF
 exit 0
 }
 
-main() {	
+main() {
 	parseopts $@
 	set -- $(updateopts $@)
 	
@@ -863,6 +865,7 @@ APKG_REPO="$PWD"
 APKG_PACKAGE_DIR="$PWD"
 APKG_SOURCE_DIR="$PWD"
 APKG_WORK_DIR="$PWD"
+log_file="$APKG_WORK_DIR"/"$(basename "$0")_$(date +"%Y%m%d_%T")".log
 
 # source config
 if [ -f $APKG_CONF ]; then
@@ -875,6 +878,9 @@ APKG_PACKAGE_DIR=${O_APKG_PACKAGE_DIR:-$APKG_PACKAGE_DIR}
 APKG_SOURCE_DIR=${O_APKG_SOURCE_DIR:-$APKG_SOURCE_DIR}
 APKG_WORK_DIR=${O_APKG_WORK_DIR:-$APKG_WORK_DIR}
 	
-main $@
+if [ ! "$APKG_LOG" ] ;
+	then main $@
+else main "$@" 2>&1 | tee -- "$log_file"
+fi
 
 exit 0
-- 
cgit v1.2.3


From 1ce923a7a12fe4e7eda4ea6868aba3af4aa0c040 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 15 Aug 2024 21:28:35 +0300
Subject: apkg: set default log dir as /var/log

---
 apkg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'apkg')

diff --git a/apkg b/apkg
index 4e7c863..6574d1f 100755
--- a/apkg
+++ b/apkg
@@ -865,7 +865,8 @@ APKG_REPO="$PWD"
 APKG_PACKAGE_DIR="$PWD"
 APKG_SOURCE_DIR="$PWD"
 APKG_WORK_DIR="$PWD"
-log_file="$APKG_WORK_DIR"/"$(basename "$0")_$(date +"%Y%m%d_%T")".log
+[!APKG_LOG_DIR] && APK_LOG_DIR="/var/log"
+log_file="$APKG_LOG_DIR"/"$(basename "$0")_$(date +"%Y%m%d_%T")".log
 
 # source config
 if [ -f $APKG_CONF ]; then
-- 
cgit v1.2.3


From a37c2cecb60cb0292c72dc5f9608f080bf906552 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 15 Aug 2024 21:41:15 +0300
Subject: fix check... thanks @emmet1

---
 apkg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apkg')

diff --git a/apkg b/apkg
index 6574d1f..0b46baf 100755
--- a/apkg
+++ b/apkg
@@ -865,7 +865,7 @@ APKG_REPO="$PWD"
 APKG_PACKAGE_DIR="$PWD"
 APKG_SOURCE_DIR="$PWD"
 APKG_WORK_DIR="$PWD"
-[!APKG_LOG_DIR] && APK_LOG_DIR="/var/log"
+[-z $APKG_LOG_DIR ] && APKG_LOG_DIR="/var/log"
 log_file="$APKG_LOG_DIR"/"$(basename "$0")_$(date +"%Y%m%d_%T")".log
 
 # source config
-- 
cgit v1.2.3


From e028c8055292a70dcac46e0b94c41f4f177c818c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 15 Aug 2024 21:56:34 +0300
Subject: apkg: use parameter expansion (@emmett1)

---
 apkg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apkg')

diff --git a/apkg b/apkg
index 0b46baf..84aaa9c 100755
--- a/apkg
+++ b/apkg
@@ -865,7 +865,7 @@ APKG_REPO="$PWD"
 APKG_PACKAGE_DIR="$PWD"
 APKG_SOURCE_DIR="$PWD"
 APKG_WORK_DIR="$PWD"
-[-z $APKG_LOG_DIR ] && APKG_LOG_DIR="/var/log"
+APKG_LOG_DIR=${APKG_LOG_DIR:-/var/log}
 log_file="$APKG_LOG_DIR"/"$(basename "$0")_$(date +"%Y%m%d_%T")".log
 
 # source config
-- 
cgit v1.2.3