From 4925158aa26eed01e930f4d8f2f1882c8a6cf1cf Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 16 Apr 2024 14:56:21 +0200
Subject: [PATCH] modulecmd: don't abbreviate output of search command.

The output of the search command shouldn't be abbreviated if not
running in a terminal.
---
 CHANGELOG.md               |  2 ++
 Pmodules/modulecmd.bash.in | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9be6d84..014ae10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
   V_MAJOR, V_MINOR, V_PATCHLVL was broken in cases where the
   version number consist of less then three numbers and plus a
   suffix. (issue #248)
+* BUGFIX: don't abbreviate out of search if not running in a
+  terminal. (issue #250)
 
 ### build-system
 * Option '--clean-install' added. If this option is set, the 
diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 42d19b9..57c73e1 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -32,7 +32,7 @@ declare -r os_release=$(std::get_os_release)
 path="${libexecdir}:/bin:/usr/bin"
 std::def_cmds "${path}" \
 	      'awk' 'base64' 'dirname' 'find' 'getopt' 'logger' 'mktemp' \
-	      'rm' 'sed' 'sort' 'yq'
+	      'rm' 'sed' 'sort' 'tput' 'yq'
 
 declare -rx TCL_LIBRARY="${PMODULES_HOME}/lib/tcl@TCL_VERSION@"
 declare -x  TCLLIBPATH
@@ -1266,10 +1266,12 @@ SWITCHES:
 subcommand_avail() {
 	# use this variable in the output functions
 	local -a mods=()
-	local dir=''
+	local -- dir=''
 
-	# get number of columns of terminal
-	cols=$(tput cols)
+	# get number of columns of terminal, set to a default if not running
+	# in a terminal.
+	local -i cols=80
+	[[ -t 1 -a -t 2 ]] && cols=$(tput cols)
 
 	#......................................................................
 	output_header() {
@@ -2115,7 +2117,8 @@ subcommand_list() {
 		done
 		colsize+=2
 
-		local -i cols=$(tput cols)
+		local -i cols=80
+		[[ -t 1 -a -t 2 ]] && cols=$(${tput} cols)
 		local -i column=0
 		printf "Currently Loaded Modules:\n" 1>&2
 		for s in "${strs[@]}"; do
@@ -2296,7 +2299,8 @@ subcommand_search() {
 	local modules=()
 	local groups=()
 	local with_modules='//'
-	local -ir cols=$(tput cols)	# get number of columns of terminal
+	local -i cols=80
+	[[ -t 1 -a -t 2 ]] && cols=$(${tput} cols)	# get number of columns of terminal
 	local -i max_len_modulename=0
 	local src_prefix=()
 	local opt_print_header='yes'
@@ -2344,7 +2348,7 @@ subcommand_search() {
                 print_line_default() {
 			write_line() {
 				local str="$1"
-				if (( ${#str} >= cols )); then
+				if [[ -t 1 -1 -t 2 ]] && (( ${#str} >= cols )); then
 					str="${str:0:$((cols-1))}>"
 				fi
 				std::info "${str}"