Bug fixes

Author: gitbls

plugins/venv

@@ -31,14 +31,7 @@ function dovenv() {
     # createoptions for the python -m venv $path
     # pyver
     # optional pip list command at end
-    function venvpline() {
-	local line
-	while read line
-	do
-	    logtoboth "  $line"
-	    echo $line >> /usr/local/bin/logit.txt
-	done
-    }
+
     local pip python fcreate=0
 
     python="python${pyver}"
@@ -64,7 +57,7 @@ function dovenv() {
 	copt=""
 	[ "$createoptions" != "" ] && copt=" with create options '$createoptions'"
 	logtoboth "> Plugin $pfx: Create venv '$path'$copt"
-	docmdlog "$python -m venv $createoptions $path" /etc/sdm/apt.log || logtobothex "? Plugin $pfx: Python venv create returned an error"
+	runcaptureout "$python -m venv $createoptions $path" /etc/sdm/apt.log || logtobothex "? Plugin $pfx: Python venv create returned an error"
     fi
 
     [[ ! -d $path ]] || [[ ! -f $path/pyvenv.cfg ]] && logtobothex "? Plugin $pfx: Python venv $path does not exist"
@@ -95,7 +88,7 @@ function dovenv() {
     if [ "$list" != "" ]
     then
 	logtoboth "> Plugin $pfx: $pip list venv '$path'"
-	{ { { {  $path/bin/$pip list 2>&1; echo $? >&3; } | venvpline >&4; } 3>&1; } | { read xs; exit $xs; } } 4>&1
+	runcaptureout "$path/bin/$pip list" || logtobothex "? Error returned from '$path/bin/$pip list' ($?)"
     fi
 }
 

sdm-cparse

@@ -34,8 +34,10 @@ function logit {
     # Writes message to /etc/sdm/history
     #
     # $1="message string"
+    # $2=/path/to/log [/etc/sdm/history]
     #
-    [ -f $SDMPT/etc/sdm/history ] && echo "$(thisdate) $1" >> $SDMPT/etc/sdm/history
+    msg="$1" logf=${2:-/etc/sdm/history}
+    [ -f $SDMPT/$logf ] && echo "$(thisdate) $msg" >> $SDMPT/$logf
 }
 
 function logtoboth() {
@@ -44,18 +46,19 @@ function logtoboth() {
     #
     # $1="message string" which will be split up across multiple lines if needed
     # $2="nosplit" if lines should not be split up
+    # $3=/path/to/logfile for alternate log
     #
-    local msg="$1"
+    local msg="$1" mods=$2 logf=${3:-/etc/sdm/history}
     local str=() i spc=""
-    if [[ ${#msg} -le $logwidth ]] || [[ "$2" == "nosplit" ]]
+    if [[ ${#msg} -le $logwidth ]] || [[ "$mods" == "nosplit" ]]
     then
-	logit "$msg"
+	logit "$msg" $logf
 	echo "$msg"
     else
 	readarray -t str <<< $(fold -s -w$logwidth <<< $(echo "$msg"))
 	for (( i=0 ; i < ${#str[@]} ; i++))
 	do
-	    logit "${spc}${str[$i]}"
+	    logit "${spc}${str[$i]}" $logf
 	    echo "${spc}${str[$i]}"
 	    spc="  "
 	done
@@ -195,6 +198,8 @@ function doapt() {
 	else
 	    # Technique from https://unix.stackexchange.com/questions/14270/get-exit-status-of-process-thats-piped-to-another/73180#73180
 	    { { { { DEBIAN_FRONTEND=noninteractive $aptcmd -o=Dpkg::Use-Pty=0 $options $1 2>&1; echo $? >&3; } | pline >&4; } 3>&1; } | { read xs; exit $xs; } } 4>&1
+	    # This V doesn't work when passed as argument ;(
+	    #runcaptureout "DEBIAN_FRONTEND=noninteractive $aptcmd -o=Dpkg::Use-Pty=0 $options $1"
 	    sts=$?
 	fi
     fi
@@ -217,13 +222,13 @@ function runcaptureout() {
     #
     # Run command, capturing output via logtoboth
     #
-    local cmd="$1"
+    local cmd="$1" outlog="$2"
 
     function pline() {
         local line
         while read line
         do
-            logtoboth "$line"
+            logtoboth "$line" $outlog
         done
     }
 
@@ -309,13 +314,6 @@ function getpipver() {
 }
 
 function installviapip() {
-    function pline() {
-	local line
-	while read line
-	do
-            echo "$(thisdate) $line" >> /etc/sdm/apt.log
-	done
-    }
     # $1: package name
     # $2: /path/to/pip3 in the venv
     # $3: pip install options
@@ -331,11 +329,10 @@ function installviapip() {
 	$vpip3 install --ignore-installed $options $pkg 2>&1 | tee -a /etc/sdm/apt.log
 	sts=$?
     else
-	# Technique from https://unix.stackexchange.com/questions/14270/get-exit-status-of-process-thats-piped-to-another/73180#73180
-	{ { { { $vpip3 install --ignore-installed $options $pkg 2>&1; echo $? >&3; } | pline >&4; } 3>&1; } | { read xs; exit $xs; } } 4>&1
+	runcaptureout "$vpip3 install --ignore-installed $options $pkg"
 	sts=$?
     fi
-    [[ "$poptions" =~ "nologdates" ]] && td="" || td="$(thisdate) "
+    #[[ "$poptions" =~ "nologdates" ]] && td="" || td="$(thisdate) "
     echo "${td}[Done] [$sts]" >> /etc/sdm/apt.log
     return $sts
 }