From aae257b7f67f8ed37c8601a592e40db45d93b8db Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 24 Jan 2017 11:13:32 +0100
Subject: [PATCH] dialog based module installation removed (see also issue #5)

---
 Pmodules/modmanage.bash.in | 132 ---------------------
 Pmodules/modsync.bash      | 236 -------------------------------------
 compile_pmodules.sh        |   6 +-
 3 files changed, 3 insertions(+), 371 deletions(-)
 delete mode 100755 Pmodules/modsync.bash

diff --git a/Pmodules/modmanage.bash.in b/Pmodules/modmanage.bash.in
index 877dc03..a9ba5de 100755
--- a/Pmodules/modmanage.bash.in
+++ b/Pmodules/modmanage.bash.in
@@ -813,138 +813,6 @@ subcommand_search() {
 	print_modules_found
 }
 
-###############################################################################
-#
-# sub-command 'sync'
-#
-subcommand_sync() {
-	local delete=false
-	local opts=''
-	local dst_prefix=''
-	local src_prefix=''
-
-	opts=$(pmodules::get_options -o h -l dst: -l delete -l help -- "$@")
-	if [[ $? != 0 ]]; then
-		subcommand_help_sync
-		exit 1
-	fi
-	eval set --  "${opts}"
-	while (($# > 0)); do
-		case $1 in
-			--dst )
-				dst_prefix="$2"
-				shift
-				;;
-			--delete )
-				delete=true
-				;;
-			-- )
-				:
-				;;
-			-* | -h | --help )
-				echo "$1: illegal option" 1>&2
-				subcommand_help_init
-				exit 1
-				;;
-			* )
-				[[ -n "${src_prefix}" ]] && \
-				        std::die 1 "Error: Only one source is allowed!"
-				src_prefix="$1"
-				;;
-		esac
-		shift
-	done
-	unset -v opts
-
-	if [[ -z "${dst_prefix}" ]]; then
-		dst_prefix="${PMODULES_ROOT}"
-	fi
-	(
-		PMODULES_ROOT="${dst_prefix}" pmodules::check_env || \
-		        std::die 1 "Error: invalid destination modules environment!"
-	) || std::die 1 "Giving up..."
-	
-	: ${src_prefix:=${PMODULES_INSTALL_SOURCE}} 
-	if [[ -z "${src_prefix}" ]]; then
-            std::die 1 "Error: no source module environment was specified!"
-        fi
-	(
-		PMODULES_ROOT="${src_prefix}" pmodules::check_env || \
-		    std::die 1 "Error: invalid source modules environment!"
-	) || std::die 1 "Giving up..."
-	[[ "$( cd "$src_prefix"; pwd -P )" == "$( cd "$dst_prefix"; pwd -P )" ]] && \
-	    std::die 1 "Error: source and destination are equal!"
-	local modbin=${PMODULES_HOME#"${PMODULES_ROOT}/"}/bin/modulecmd.tcl
-	local file_type_src=$( file -b "${src_prefix}/${modbin}" 2>&1 || echo err1 )
-	local file_type_dst=$( file -b "${dst_prefix}/${modbin}" 2>&1 || echo err2 )
-	[[ "${file_type_src}" == "${file_type_dst}" ]] || \
-	    std::die 1 "Error: The file signatures in the source and destination installation do not match!"
-	unset -v file_type_src file_type_dst
-	local dialog_script="${PMODULES_HOME}/bin/dialog.bash"
-	[[ -r "$dialog_script" ]] || \
-		std::die 1 "Error: Unable to find dialog script of installation $dialog_script";
-
-	DIALOG_LIB=1                # use dialog script as a library
-	source "$dialog_script"     # dialog functions
-
-	# Redefine module_out to append modules to the selected_modules variable
-        local -a selected_modules
-	module_out() {
-		local -a args=(${modlist[$1]})
-		local path=""
-		IFS=/
-		[[ -n "${args[3]}" ]] && path="/${args[*]:3}"
-		unset IFS
-		selected_modules+=( "${args[2]}${path}/${args[0]}" )
-	}
-
-	module_picker "${dst_prefix}" "${src_prefix}" || {
-		# this calls module_out for each selected module,
-		#filling up the selected_modules array
-		echo "Abort!"
-		exit 1
-	}
-
-	local -a destination_modules=( $(cd "${dst_prefix}/${PMODULES_MODULEFILES_DIR}"; find -L . -type f | while read f; do n=${f##*/}; [[ "${n:0:1}" == "." ]] || echo ${f#./}; done) )
-
-	# redefine set difference, the version in dialog.bash only handles integers
-	set_difference() {  #  $1 \ $2
-		local -a operand1=($1)
-		local -a operand2=($2)
-		local -A members
-		local elem
-		for elem in "${operand1[@]}"; do
-			members[$elem]=1
-		done
-		for elem in "${operand2[@]}"; do
-			unset members[$elem]
-		done
-		echo ${!members[@]}
-	}
-
-	if [[ "$delete" == "true" ]]; then
-		local -a modules_delete=( $(set_difference "${destination_modules[*]}" "${selected_modules[*]}") )
-		for m in "${modules_delete[@]}"; do
-                        echo "Deleting module $m ..."
-			delete_module "$m" "$dst_prefix"
-		done
-		unset modules_delete
-	fi
-
-	local -a modules_copy=( $(set_difference "${selected_modules[*]}" "${destination_modules[*]}") )
-	if [[ -n $modules_copy ]]; then
-		echo "Syncing configuration ..."
-		sync_config "$src_prefix" "$dst_prefix" || \
-		        std::die 1 "Error: syncing the configuration failed"
-        fi
-        for m in "${modules_copy[@]}"; do
-                echo "Copying module $m ..."
-		sync_module "$m" "$src_prefix" "$dst_prefix" || \
-		        std::die 1 "Error: syncing of module $m failed!"
-        done
-	unset modules_copy
-}
-
 while (($# > 0)); do
 	case $1 in
 		-h | -H | -\? | --help | -help )
diff --git a/Pmodules/modsync.bash b/Pmodules/modsync.bash
deleted file mode 100755
index ad9f148..0000000
--- a/Pmodules/modsync.bash
+++ /dev/null
@@ -1,236 +0,0 @@
-#!/usr/bin/env bash
-
-declare -r DEFAULT_SRC="/afs/psi.ch/sys/psi.@sys"
-declare -r DEFAULT_DST="/opt/psi.local"
-
-usage() {
-    echo "
-$0 [--from=<source>] [--to=<destination>] [--dryrun] [--delete]
-    --from    source module installation (default: $DEFAULT_SRC)
-
-    --to      destination module installation (default: $DEFAULT_DST)
-
-    --dryrun  just tell what would be copied and deleted
-
-    --delete  as an additional task, delete modules that are present
-              at the destination but not at the source installation
-              (destination cleanup)" >&2
-}
-
-die() {
-    echo "$1" >&2
-    exit 1
-}
-
-# check if directory $1 is a valid prefix
-is_module_prefix() {
-    if [[ -d "$1" ]] &&
-       [[ -d "$1/$PMODULES_CONFIG_DIR" ]] &&
-       [[ -d "$1/$PMODULES_MODULEFILES_DIR" ]]
-    then
-        return 0
-    fi
-    return 1
-}
-
-# set the source and destination module installations
-get_options() {
-    local src_dir="$DEFAULT_SRC"
-    local dst_dir="$DEFAULT_DST"
-    local dryrun=false
-    local delete=false
-    local option
-
-    while (($# > 0)); do
-        if [[ "${1#--from}" != "$1" ]]; then
-            option="${1#--from}"
-            option="${option#=}"
-            [[ -z "$option" ]] && { shift; option="$1"; }
-            src_dir="$option"
-        elif [[ "${1#--to}" != "$1" ]]; then
-            option="${1#--to}"
-            option="${option#=}"
-            [[ -z "$option" ]] && { shift; option="$1"; }
-            dst_dir="$option"
-        elif [[ -z "${1#--dryrun}" ]]; then
-            dryrun=true
-        elif [[ -z "${1#--delete}" ]]; then
-            delete=true
-        else
-            usage > /dev/fd/2
-            std::die "Unknown option: $1"
-        fi
-        shift
-    done
-
-    is_module_prefix "$src_dir" || { std::die "<$src_dir> is not a Pmodules installation"; }
-    is_module_prefix "$dst_dir" || { std::die "<$dst_dir> is not a Pmodules installation"; }
-    src_dir=$( cd "$src_dir"; pwd -P )
-    dst_dir=$( cd "$dst_dir"; pwd -P )
-    [[ "$src_dir" == "$dst_dir" ]] && { std::die "same source and destination installations"; }
-    local modbin=$( cd "$PMODULES_HOME"; pwd -P )
-    local prefix=$( cd "$PMODULES_PREFIX"; pwd -P )
-    modbin=${modbin#"$prefix/"}/bin/modulecmd
-    local -r file_type_src=$( file -b "$src_dir/$modbin" 2>&1 || echo err1 )
-    local -r file_type_dst=$( file -b "$dst_dir/$modbin" 2>&1 || echo err2 )
-    [[ ! "${file_type_src}" == "${file_type_dst}" ]] || {
-        std::die "The file signatures in the source and destination installation do not match!"
-    }
-    echo "$src_dir" "$dst_dir" "$dryrun" "$delete"
-}
-
-# Derive the relative module installation path
-#    from the relative module file path
-# $1 relative module file path
-get_modpath() {
-    local -a comp=( ${1//\// } )    # split rel.path into components
-    local -a path		    # result path
-    local -i i
-    for ((i=0; i<${#comp[@]}; i++)); do
-        case $i in
-            0) path=( ${comp[0]%.*} );;
-            *) path+=( "${comp[$((-i-1))]}/${comp[$((-i))]}" ); i+=1;;
-        esac
-    done
-    echo "${path[*]}"
-}
-
-# Derive the relative module release file path
-#    from the relative module file path
-# $1 relative module file path
-get_release_path() {
-    echo "$(dirname "$1")/.release-$(basename "$1")"
-}
-
-# $1 dryrun=(true|false)
-# $2 relative module file path of destination module to be deleted
-# $3 destination prefix
-delete_module() {
-    if [[ "$1" != "false" ]]; then
-        echo "(dryrun) delete: $2 at $3" 1>&2
-        return 0
-    fi
-    local modpath=$( get_modpath "$2" )
-    [[ -z "$modpath" ]] && {
-	std::die "Unable to retrieve module file and installation paths";
-    }
-    echo "rm -v \"$3/$PMODULES_MODULEFILES_DIR/$2\""
-    echo "rm -v \"$3/$PMODULES_MODULEFILES_DIR/$( get_release_path $2 )\""
-    echo "rmdir -vp \"$( dirname "$3/$PMODULES_MODULEFILES_DIR/$2" )\""
-    echo "rm -vrf \"$3/$modpath\""
-    echo "rmdir -vp \"$( dirname "$3/$modpath" )\""
-    echo "deleted: $2" 1>&2
-}
-
-# $1 dryrun=(true|false)
-# $2 relative module file path of source module to be copied to the destination
-# $3 source prefix
-# $4 destination prefix
-copy_module() {
-    if [[ "$1" != "false" ]]; then
-        echo "(dryrun) copy: $2 from $3 to $4" 1>&2
-        return 0
-    fi
-    local modpath=$( get_modpath "$2" )
-    [[ -z "$modpath" ]] && { std::die "Unable to retrieve module file and installation paths"; }
-    install -d $( dirname "$3/$PMODULES_MODULEFILES_DIR/$2" )
-    (
-        cd $3
-        rsync --links --perms --relative --verbose "$PMODULES_MODULEFILES_DIR/$2" "$4"
-        rsync --links --perms --relative --verbose "$PMODULES_MODULEFILES_DIR/$( get_release_path "$2" )" "$4"
-        rsync --recursive --links --perms --relative --verbose "$modpath" "$4"
-    )
-    echo "copied: $2" 1>&2
-}
-
-# syncronize modules from source to
-# destination module installations
-# --from=<source>        default: /afs/psi.ch/sys/psi.@sys
-# --to=<destination>     default: /opt/psi.local
-sync_modules() {
-    local -a options=( $(get_options "$@") )
-    [[ -z "$options" ]] && exit 1
-    local src_dir="${options[0]}"
-    local dst_dir="${options[1]}"
-    local dryrun="${options[2]}"
-    local delete="${options[3]}"
-    unset options
-
-    local profile_script="$src_dir/$PMODULES_CONFIG_DIR/profile.bash"
-    [[ -r "$profile_script" ]] || {
-	std::die "Unable to find profile script of installation $profile_script";
-    }
-    local search_script="$src_dir/Tools/Pmodules/${PMODULES_VERSION}/bin/modulecmd"
-    [[ -x "$search_script" ]] || {
-	std::die "Unable to find search script of installation $search_script";
-    }
-    local dialog_script="$src_dir/Tools/Pmodules/${PMODULES_VERSION}/bin/dialog.bash"
-    [[ -r "$dialog_script" ]] || {
-	std::die "Unable to find dialog script of installation $dialog_script";
-    }
-
-    . "$profile_script"    # set variables for the source installation
-
-    DIALOG_LIB=1           # use dialog script as a library
-    . "$dialog_script"     # dialog functions
-
-    local -a selected_modules
-
-    # Redefine module_out to append modules to the selected_modules variable
-    module_out() {
-        local -a args=(${modlist[$1]})
-        local path=""
-        IFS=/
-        [[ -n "${args[3]}" ]] && path="/${args[*]:3}"
-        unset IFS
-        selected_modules+=( "${args[2]}$path/${args[0]}" )
-    }
-
-    module_picker "$dst_dir" < <("$search_script" bash search --no-header -a 2>&1)
-
-    local -a destination_modules=( $(cd "$dst_dir/$PMODULES_MODULEFILES_DIR"; find -L . -type f | while read f; do echo ${f#./}; done) )
-
-    # redefine set difference, the version in dialog.bash only handles integers
-    set_difference() {  #  $1 \ $2
-        local -a operand1=($1)
-        local -a operand2=($2)
-        local -A members
-        local elem
-        for elem in "${operand1[@]}"; do
-            members[$elem]=1
-        done
-        for elem in "${operand2[@]}"; do
-            unset members[$elem]
-        done
-        echo ${!members[@]}
-    }
-
-    [[ "$delete" == "true" ]] && {
-        local -a modules_delete=( $(set_difference "${destination_modules[*]}" "${selected_modules[*]}") )
-        for m in "${modules_delete[@]}"; do
-            delete_module "$dryrun" "$m" "$dst_dir"
-        done
-        unset modules_delete
-    }
-
-
-    local -a modules_copy=( $(set_difference "${selected_modules[*]}" "${destination_modules[*]}") )
-    [[ -z $modules_copy ]] || {
-        if [[ "$dryrun" != "false" ]]; then
-            echo "(dryrun) update: $dst_dir/$PMODULES_CONFIG_DIR from $src_dir/$PMODULES_CONFIG_DIR" 1>&2
-        else
-            (
-            local -a extraoption="$( [[ "$delete" == "true" ]] && echo --delete )"
-            cd "$src_dir"
-            rsync --recursive --links --perms --relative $extraoption --verbose --exclude .git "$PMODULES_CONFIG_DIR" "$dst_dir"
-            echo "updated: $PMODULES_CONFIG_DIR from $src_dir" 1>&2
-            )
-        fi
-        for m in "${modules_copy[@]}"; do
-            copy_module "$dryrun" "$m" "$src_dir" "$dst_dir"
-        done
-    }
-    unset modules_copy
-}
-
-sync_modules "$@"
diff --git a/compile_pmodules.sh b/compile_pmodules.sh
index 9e6b737..51eede4 100755
--- a/compile_pmodules.sh
+++ b/compile_pmodules.sh
@@ -62,9 +62,9 @@ if [[ ! -f "${PMODULES_HOME}/bin/getopt" ]] || [[ ${force} == 'yes' ]]; then
 	build getopt "${GETOPT_VERSION}"
 fi
 
-if [[ ! -f "${PMODULES_HOME}/sbin/dialog" ]] || [[ ${force} == 'yes' ]]; then
-	build dialog "${DIALOG_VERSION}"
-fi
+#if [[ ! -f "${PMODULES_HOME}/sbin/dialog" ]] || [[ ${force} == 'yes' ]]; then
+#	build dialog "${DIALOG_VERSION}"
+#fi
 
 if [[ ! -f "${PMODULES_HOME}/sbin/bash" ]] || [[ ${force} == 'yes' ]]; then
 	build bash "4.3.30"