From 1b8f28c608e9e04836e6a2e1dc37f15f7b8af217 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 4 May 2018 17:28:38 -0400 Subject: [PATCH] switched away from nautilus to dolphin ubuntu file manager dolphin behaves much better and does more of what i want than nautilus. current macro for exp uses this. dolphin launches in screen but still causes kde logging; need to look into this. also fixed help instructions in screened tunneler script. --- scripts/core/common.alias | 5 ++++- scripts/security/screened_tunneler.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/core/common.alias b/scripts/core/common.alias index 09eb72ec..9ebddb76 100644 --- a/scripts/core/common.alias +++ b/scripts/core/common.alias @@ -41,8 +41,11 @@ if [ "$OS" != "Windows_NT" ]; then if [ -n "$IS_DARWIN" ]; then # case for mac os x. define_yeti_alias exp='open' + elif [ ! -z "$(which dolphin 2>/dev/null)" ]; then + # we prefer dolphin if available. + define_yeti_alias exp='screen -L -S dolphin-$RANDOM -d -m dolphin --select ' elif [ ! -z "$(which nautilus 2>/dev/null)" ]; then - # we prefer nautilus if available. + # launch nautilus if available. define_yeti_alias exp='nautilus' else # last ditch is konqueror browser. diff --git a/scripts/security/screened_tunneler.sh b/scripts/security/screened_tunneler.sh index 82352cc7..62301ccd 100644 --- a/scripts/security/screened_tunneler.sh +++ b/scripts/security/screened_tunneler.sh @@ -36,7 +36,7 @@ LAUNCH_IT="$1"; shift function print_instructions() { - echo "\ + echo -e "\ $(basename $0): This script requires at least three parameters and can\n\ take up to five. The parameters are (1) tunnel user at hostname, (2) ssh tunnel\n\ link command, (3) tunnel screen name, (4) tunnel security key, (5) the launch\n\ -- 2.34.1