From 7fcda270d86579a4140c8b4c4a5e967dd39915ae Mon Sep 17 00:00:00 2001 From: Michael Krayer Date: Mon, 19 Apr 2021 20:48:13 +0200 Subject: [PATCH] remove some obsolete code; refactor --- session | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/session b/session index b5c46be..7f56474 100755 --- a/session +++ b/session @@ -24,13 +24,11 @@ if [ -f "$CONFIG_FILE" ]; then fi # Set some variables -export ABDUCO_SOCKET_DIR=${config[socket_dir]} -SOCKET_PREFIX="${config[socket_dir]}/abduco/$USER/" -SOCKET_SUFFIX="@${HOSTNAME}" -LOG_PREFIX="${config[socket_dir]}/log/" -LOG_SUFFIX=".log" -mkdir -p $SOCKET_PREFIX -mkdir -p $LOG_PREFIX +export ABDUCO_SOCKET_DIR=${config[session_dir]} +SOCKET_DIR="${config[session_dir]}/abduco/$USER/" +LOG_DIR="${config[socket_dir]}/log/" +mkdir -p $SOCKET_DIR +mkdir -p $LOG_DIR # Exit codes EXIT_SUCCESS=0 @@ -98,17 +96,17 @@ get_available_sessions() { get_session_path() { local session_name=$1 - echo "${SOCKET_PREFIX}${session_name}${SOCKET_SUFFIX}" + echo "${SOCKET_DIR}/${session_name}@${HOSTNAME}" } get_log_path() { local session_name=$1 - echo "${LOG_PREFIX}${session_name}.log" + echo "${LOG_DIR}${session_name}.log" } get_fifo_path() { local session_name=$1 - echo "${LOG_PREFIX}${session_name}.fifo" + echo "${LOG_DIR}${session_name}.fifo" } get_session_pid() { @@ -190,13 +188,6 @@ select_session() { done } -print_session_info() { - local session_name=$1 - local session_path=$(get_session_path $session_name) - local session_time=$(date -r $session_path "+%Y-%m-%d %H:%M:%S") - printf "%-24s %-20s %s\n" "$session_name" "$session_time" "$session_path" -} - print_scrollback() { local session_name=$1 local log_path=$(get_log_path $session_name)