Fix grep_xseg to work both with include/exclude

diff --git a/arch-scripts/grep_xseg.sh b/arch-scripts/grep_xseg.sh
index 194c3ff..f7d108d 100755 (executable)
--- a/arch-scripts/grep_xseg.sh
+++ b/arch-scripts/grep_xseg.sh
@@ -23,7 +23,7 @@ if [[ -z $1 ]]; then
        red_echo "No parameters given."
        exit 1
 elif [[ $1 = "-m" ]]; then
-       INCLUDE="--include=Makefile --include=*.mk"
+       INCLUDE="--include=Makefile --include=*.mk --include=envsetup"
        shift
 fi
 
@@ -31,6 +31,8 @@ fi
 # Grep XSEG #
 #############
 
-grep -RIni --exclude-dir=${XSEG}/sys/user/python --exclude=test.c \
-       ${INCLUDE} --color=always -e $1 ${XSEG} | \
+grep -RIni --color=always ${INCLUDE} \
+       --exclude-dir=python \
+       -e $1 ${XSEG} | \
        sed 's/'$SED_XSEG'//'
+

diff --git a/arch-scripts/make_xseg.sh b/arch-scripts/make_xseg.sh
index ec48a61..add01b8 100755 (executable)
--- a/arch-scripts/make_xseg.sh
+++ b/arch-scripts/make_xseg.sh
@@ -13,6 +13,7 @@ ARCH_SCRIPTS=$(dirname "$(readlink /proc/$$/fd/255)")
 source $ARCH_SCRIPTS/init.sh
 
 PIPE="1>/dev/null"
+if [[ ! "$(logname)" = "root" ]]; then $SUDO=sudo; fi
 
 #############
 # Arguments #
@@ -36,4 +37,4 @@ if [[ $CLEAN ]]; then
        eval make clean $PIPE
 fi
 eval make $PIPE
-eval sudo make install $PIPE
+eval $SUDO make install $PIPE