diff --git a/install.sh b/install.sh index b1fb030..59a8b5c 100755 --- a/install.sh +++ b/install.sh @@ -6,18 +6,21 @@ function install_lws() { local LWS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) if grep -q -e "source.*$LWS_DIR/bashrc" $HOME/.bashrc; then - echo "SKIP: Linux Workspace configuration already exists in .bashrc !" + echo "SKIP: Linux Workspace configuration already exists in $HOME/.bashrc !" else echo "Adding to $HOME/.bashrc" echo "source '$LWS_DIR/bashrc'" >> "$HOME/.bashrc" fi - if [[ -d $HOME/.config/fish/ ]]; then - if [[ -f $HOME/.config/fish/config.fish ]]; then - echo "SKIP: Linux Workspace configuration already exists in fish config !" + local FISH_CONF_DIR="$HOME/.config/fish" + local FISH_CONF_LWS="$FISH_CONF_DIR/conf.d/lws.fish" + + if [[ -d "$FISH_CONF_DIR" ]]; then + if [[ -f "$FISH_CONF_LWS" ]]; then + echo "SKIP: Linux Workspace configuration already exists in $FISH_CONF_LWS !" else - echo "Adding to $HOME/.config/fish/conf.d/lws.fish" - echo "source $LWS_DIR/fishrc" > $__fish_config_dir/conf.d/lws.fish + echo "Adding to $FISH_CONF_LWS" + echo "source $LWS_DIR/fishrc" > "$FISH_CONF_LWS" fi else echo "Fish configuration directory not found, skipping fish setup."