diff --git a/setup.sh b/setup.sh index 9f2e07e..26adc25 100755 --- a/setup.sh +++ b/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -mkdir -p ~/.my/log +mkdir -p ~/.var/log mkdir -p ~/.local/bin _iswindows(){ diff --git a/shrc b/shrc index 2bc2191..95d8a44 100755 --- a/shrc +++ b/shrc @@ -777,8 +777,8 @@ showinfo(){ x(){ if [[ -z $DISPLAY ]] && ! [[ -e /tmp/.X11-unix/X0 ]] && (( EUID )); then - #mkdir -p ~/.my/log - # nohup startx >~/.my/log/xorg.log 2>&1 & + #mkdir -p ~/.var/log + # nohup startx >~/.var/log/xorg.log 2>&1 & # exit exec startx else @@ -805,7 +805,7 @@ di(){ tb(){ local datenum=`date +%Y%m%d-%H%M%S` - local tb="$HOME/.my/tb/$datenum" + local tb="$HOME/.var/tb/$datenum" mkdir -p "$tb" for file in "$@" do diff --git a/xinitrc b/xinitrc old mode 100644 new mode 100755 index 4d2e6ba..51aa0e2 --- a/xinitrc +++ b/xinitrc @@ -4,6 +4,7 @@ test -n "$DISPLAY" || return test -z "$ROXTERM_PID" || return test -z "$SSH_CONNECTION" || return +# if already in x return case "$TERM" in xterm*) return;; esac diff --git a/xprograms b/xprograms index 31d6ae3..6d0ab87 100755 --- a/xprograms +++ b/xprograms @@ -26,8 +26,8 @@ _gsoundap(){ } _conky(){ - conky -c ~/.dotfiles/conkyrc >~/.my/log/conky.log 2>&1 & - conky -c ~/.dotfiles/conkyrc.2 >~/.my/log/conky.2.log 2>&1 & + conky -c ~/.dotfiles/conkyrc >~/.var/log/conky.log 2>&1 & + conky -c ~/.dotfiles/conkyrc.2 >~/.var/log/conky.2.log 2>&1 & } _wicd(){