From e8f3a7d96469dd6ddc2fad0a72b5861d55228936 Mon Sep 17 00:00:00 2001 From: nahuhh <50635951+nahuhh@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:17:57 +0000 Subject: [PATCH] hide xfce err --- bsx/update.sh | 2 +- install.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bsx/update.sh b/bsx/update.sh index 89fd33e..2cd07d4 100755 --- a/bsx/update.sh +++ b/bsx/update.sh @@ -3,7 +3,7 @@ cd $SWAP_DATADIR/basicswap # Download updated scripts echo "Updating basicswap-bash scripts" && sleep 1 -git clone https://github.com/nahuhh/basicswap-bash +git clone https://github.com/nahuhh/basicswap-bash -b dev cd basicswap-bash # Move scripts diff --git a/install.sh b/install.sh index a39431d..9eee25a 100755 --- a/install.sh +++ b/install.sh @@ -169,15 +169,21 @@ if ! [[ $trasherdk ]]; then mkdir -p $HOME/.local/bin fi # Move scripts to .local/bin -if [ -d $HOME/.local/bin/bsx ]; then +if [[ -d $HOME/.local/bin/bsx ]]; then rm -r $HOME/.local/bin/bsx* $HOME/.local/bin/basicswap-bash fi mv -f -t $HOME/.local/bin/ basicswap-bash bsx* # Enable .profile detection on XFCE xfce_check=$(echo $XDG_CURRENT_DESKTOP | grep XFCE) -xsessionrc_check=$(cat ~/.xsessionrc | grep '. ~/.profile') -if [[ $xfce_chek ]] && [[ -z $xsessionrc_check ]]; then - echo '. ~/.profile' | tee -a ~/.xsessionrc +if [[ $xfce_chek ]]; then + if [[ -f $HOME/.xsessionrc ]]; then + xsessionrc_check=$(cat ~/.xsessionrc | grep '. ~/.profile') + if [[ -z $xsessionrc_check ]]; then + echo '. ~/.profile' | tee -a ~/.xsessionrc + fi + else + echo '. ~/.profile' | tee -a ~/.xsessionrc + fi fi ## Make venv and set variables for install