From 781e0eb743376b80d9068eca2d1e14cb8991ff95 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 3 Feb 2009 10:14:34 -0600 Subject: [PATCH] Bugfix to prevent creation of $HOME/~/ directory --- in/scripts=wicd-client.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/in/scripts=wicd-client.in b/in/scripts=wicd-client.in index a8e2a93..776581f 100755 --- a/in/scripts=wicd-client.in +++ b/in/scripts=wicd-client.in @@ -3,15 +3,15 @@ BOLD=$(tput bold) BLUE=$(tput setaf 4) NC=$(tput sgr0) # check_firstrun() -if [ ! -d "~/.wicd" ]; then - mkdir -p "~/.wicd" +if [ ! -d "$HOME/.wicd" ]; then + mkdir -p "$HOME/.wicd" fi # Make sure the user knows WHEREAREMYFILES ;-) -if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "~/.wicd/WHEREAREMYFILES" ]; then - ln -s "%DOCDIR%WHEREAREMYFILES" "~/.wicd/WHEREAREMYFILES" +if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then + ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" fi if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then - if [ ! -f "~/.wicd/CLIENT_CURSES_WARNING" ]; then + if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then printf "NOTICE: You do not have an X server active on this console, \n" printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n" printf "Please see the wicd-client and/or wicd-curses manual pages \n" @@ -21,7 +21,7 @@ if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then printf "Press enter to continue... \n" read _junk - cat >> "~/.wicd/CLIENT_CURSES_WARNING" << EOF + cat >> "$HOME/.wicd/CLIENT_CURSES_WARNING" << EOF The wicd-client script checks for the existence of this file to determine whether it should warn the user before launching wicd-curses instead, in the event of the gui client being launched outside of the X Window environment.