lunar-linux · cavalier38 · Sep 2, 2012 · Oct 29, 2013 · Nov 8, 2013
diff --git a/libs/aliases.lunar b/libs/aliases.lunar
@@ -26,6 +26,12 @@ unalias() {
     return
   fi
 
+  # shortcut out when explicitly instructed so
+  if [[ -n "$NEVER_ASK" ]] ; then
+    echo $1
+    return
+  fi
+
   debug_msg "unalias($@)"
   # try to figure out where the aliases file is:
   if [[ -z "$ALIASES" ]] || [[ ! -f "$ALIASES" ]]; then
@@ -38,12 +44,6 @@ unalias() {
 
   TARGETS=$(awk -F: -v mod=$1 '{if ($1==mod){print $2}}' "$ALIASES")
 
-  # shortcut out when explicitly instructed so
-  if [[ -n "$NEVER_ASK" ]] ; then
-    echo $1
-    return
-  fi
-
   # propose one and let the user pick it from a list:
   debug_msg "unalias: starting selection loop"
   error_message "${MODULE_COLOR}$MODULE${DEFAULT_COLOR}${MESSAGE_COLOR} depends on ${DEFAULT_COLOR}${QUERY_COLOR}\"${1:1}\"${DEFAULT_COLOR}${MESSAGE_COLOR} which is an alias${DEFAULT_COLOR}"
@@ -62,14 +62,8 @@ unalias() {
     done
     echo -n -e "${MESSAGE_COLOR}Choice> ${DEFAULT_COLOR}" >&2
     read -t $PROMPT_DELAY CHOICE
-    # test directly first
-    if echo $TARGETS | grep -qw "$CHOICE" ; then
-      verbose_msg "Stored alias mapping $1 -> $TARGET"
-      set_local_config `echo LUNAR_ALIAS_${1:1}` $TARGET
-      echo $TARGET
-      return
-    # then the number, resolving the default
-    elif [[ -n "${TARGETBYNUM[${CHOICE:=1}]}" ]] ; then
+    # test the number, resolving the default
+    if [[ -n "${TARGETBYNUM[${CHOICE:=1}]}" ]] ; then
       verbose_msg "Stored alias mapping $1 -> ${TARGETBYNUM[$CHOICE]}"
       set_local_config `echo LUNAR_ALIAS_${1:1}` ${TARGETBYNUM[$CHOICE]}
       echo ${TARGETBYNUM[$CHOICE]}

diff --git a/libs/build.lunar b/libs/build.lunar
@@ -44,12 +44,12 @@ save_libraries()  {
   SAVED=$OLD_LIBS/$MODULE.saved.libraries
   rm  -rf  $SAVED
 
-  grep   "/lib/"  "$OLD_LOG"  |
+  fgrep  '/lib/'  "$OLD_LOG"  |
   while  read  LINE;  do
 
     if [ -f "$LINE"  ]  &&
          file  -bL  $LINE   |
-         grep  -q   "shared object"
+         fgrep -wq  'shared object'
     then
       verbose_msg "saving library \"$LINE\""
       if  [  -h  $LINE  ];  then
@@ -96,7 +96,7 @@ export_ld()  {
   local DIRECTORY
   debug_msg "export_ld ($@)"
   for DIRECTORY in $* ; do
-    if file -b $DIRECTORY/*.so* | grep  -q  "shared object" ; then
+    if file -b $DIRECTORY/*.so* | fgrep  -wq  'shared object' ; then
       if [ -z "$LD_LIBRARY_PATH" ] ; then
         export LD_LIBRARY_PATH="$DIRECTORY"
       else
@@ -346,7 +346,7 @@ run_configure() {
   fi
 
   prepare_module_config
-  grep -q "^"$MODULE"\$" "$TEMP_PREPAREDDEPS" 2>/dev/null && return 0
+  fgrep -xq "$MODULE" "$TEMP_PREPAREDDEPS" 2>/dev/null && return 0
 
   # add custom passed OPTS before retrieving them
   if [ -n "$PASS_OPTS" ] ; then

diff --git a/libs/check.lunar b/libs/check.lunar
@@ -59,7 +59,7 @@ rework_module() {
 	 (
 		if run_details $1 &> /dev/null ; then
 			if has_module_file $MODULE DEPENDS ; then
-				run_module_file $MODULE DEPENDS | grep -v '%'
+				run_module_file $MODULE DEPENDS | fgrep -v '%'
 			fi
 		fi
 	 ) 

diff --git a/libs/config.lunar b/libs/config.lunar
@@ -27,7 +27,7 @@ set_config()
 	VAR=${2#"${2%%[![:space:]]*}"}
 	VAR=${VAR%%+([[:space:]])}
 
-	LINE=$(grep -w "$VAR=.*" "$1")
+	LINE=$(grep "\<$VAR=.*" "$1")
 	FILE=$1
 
 	shift 2
@@ -72,7 +72,7 @@ unset_config()
 get_config()
 {
 	if [[ -f $1 ]] ; then
-		grep -w "$2=.*" "$1" | cut -d= -f2- | sed -e 's/^"//' -e 's/"$//'
+		grep "\<$2=.*" "$1" | cut -d= -f2- | sed -e 's/^"//' -e 's/"$//'
 	fi
 }
 

diff --git a/libs/depends.lunar b/libs/depends.lunar
@@ -62,7 +62,7 @@ function find_depends() {
     for DEP in $DEPS ; do
       DEP=$(unalias "$DEP")
       # this is our shortcut out:
-      if ! grep -qx "$DEP" "$TMP_FDEPS" ; then
+      if ! fgrep -qx "$DEP" "$TMP_FDEPS" ; then
         echo "$DEP" >> $TMP_FDEPS
         if grep -q "^$1:$DEP:required:" "$DEPENDS_CACHE" ; then
           echo "$DEP"
@@ -105,13 +105,13 @@ sort_by_dependency() {
   # note that this is logically WRONG, but it actually will help with
   # unincluded depends, and therefore is *better* behaviour
   for M in $* ; do
-    if ! grep -q -x "$M" "$TMP_ALL" ; then
+    if ! fgrep -q -x "$M" "$TMP_ALL" ; then
       echo $M >> $TMP_ALL
     fi
   done
 
   # now reverse grep over the files:
-  cat "$TMP_ALL" | grep -x -f "$TMP_LIST"
+  cat "$TMP_ALL" | fgrep -x -f "$TMP_LIST"
 
   temp_destroy $TMP_LIST
   temp_destroy $TMP_ALL
@@ -121,7 +121,7 @@ sort_by_dependency() {
 is_depends()  {
   debug_msg "is_depends ($@)"
   # Is $1 a previously selected dependency of any module.
-  return $(grep -q ":$1:on:" "$DEPENDS_STATUS")
+  return $(fgrep -q ":$1:on:" "$DEPENDS_STATUS")
 }
 
 
@@ -148,7 +148,7 @@ remove_depends() {
     fi
   elif grep -q "^$1:" "$DEPENDS_STATUS" ; then
     grep -v "^$1:" "$DEPENDS_STATUS_BACKUP" | \
-    grep -v ":$1:on:optional:" > $DEPENDS_STATUS
+    fgrep -v ":$1:on:optional:" > $DEPENDS_STATUS
     verbose_msg "removing all depends for and optional on \"$1\""
   fi
 
@@ -161,7 +161,7 @@ remove_depends() {
 
 add_depends() {
   debug_msg "add_depends ($@)"
-  if ! grep -q "^$1:$2:$3:$4:$5:$6$" "$DEPENDS_STATUS" ; then
+  if ! fgrep -xq "$1:$2:$3:$4:$5:$6" "$DEPENDS_STATUS" ; then
     lock_file $DEPENDS_STATUS_BACKUP                       &&
     lock_file $DEPENDS_STATUS                              &&
     if grep -q "^$1:$2:" "$DEPENDS_STATUS" ; then
@@ -198,7 +198,7 @@ run_depends() {
                 "${MODULE_COLOR}$DEP${DEFAULT_COLOR}"
       fi
       # don't check depends if there are already checked
-      if grep -q "^$DEP\$" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
+      if fgrep -xq "$DEP" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
         return 0
       fi
       lin --deps $DEP
@@ -219,7 +219,7 @@ run_depends() {
     if in_depends $MODULE $DEP ; then
       if ! module_installed $DEP ; then
         # don't check depends if there are already checked
-        if grep -q "^$DEP\$" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
+        if fgrep -xq "$DEP" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
           return 0
         fi
         lin --deps $DEP
@@ -244,7 +244,7 @@ run_depends() {
           verbose_msg "Enforcing optional dependency \"$DEP\""
           add_depends  "$MODULE"  "$DEP"  "on"   "optional"  "$2"  "$3"
           # don't check depends if there are already checked
-          if grep -q "^$DEP\$" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
+          if fgrep -xq "$DEP" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
             return 0
           fi
           lin --deps $DEP
@@ -253,7 +253,7 @@ run_depends() {
           verbose_msg "Auto-adding optional dependency \"$DEP\""
           add_depends  "$MODULE"  "$DEP"  "on"   "optional"  "$2"  "$3"
           # don't check depends if there are already checked
-          if grep -q "^$DEP\$" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
+          if fgrep -xq "$DEP" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
             return 0
           fi
           lin --deps $DEP
@@ -262,7 +262,7 @@ run_depends() {
           ${QUERY_COLOR}Purpose: ${DEFAULT_COLOR}${MESSAGE_COLOR}$4 ${QUERY_COLOR}?" $DEFAULT ; then
           add_depends  "$MODULE"  "$DEP"  "on"   "optional"  "$2"  "$3"
           # don't check depends if there are already checked
-          if grep -q "^$DEP\$" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
+          if fgrep -xq "$DEP" "$TEMP_PREPAREDDEPS" 2>/dev/null ; then
             return 0
           fi
           lin --deps $DEP
@@ -274,7 +274,7 @@ run_depends() {
     fi
   }
 
-  grep -q "^"$MODULE"\$" "$TEMP_PREPAREDDEPS" 2>/dev/null && return 0
+  fgrep -xq "$MODULE" "$TEMP_PREPAREDDEPS" 2>/dev/null && return 0
   if has_module_file $MODULE DEPENDS ; then
     if [ -n "$SINGLE_MODULE" ] ; then
       # we only need to show this once, but we get here twice per module
@@ -310,7 +310,7 @@ satisfy_depends()  {
   grep "^$MODULE:" "$DEPENDS_STATUS" > $TMP_FILE
 
   # first recursively check if all required dependencies are installed
-  for DEP_MODULE in $(find_depends $MODULE | grep -v '%') ; do
+  for DEP_MODULE in $(find_depends $MODULE | fgrep -v '%') ; do
     if [ $DEP_MODULE != $MODULE ]; then
       if ! module_installed $DEP_MODULE ; then
         if module_exiled $DEP_MODULE ; then
@@ -445,7 +445,7 @@ create_depends_cache()
 
     # speedups for system moonbases:
     if [ "$MOONBASE" == "/var/lib/lunar/moonbase" ] && [ -f "$INSTALL_LOGS/moonbase-$(installed_version moonbase)" ] ; then
-      DEPFILES=$(grep "/DEPENDS$" "$INSTALL_LOGS/moonbase-$(installed_version moonbase)")
+      DEPFILES=$(grep '/DEPENDS$' "$INSTALL_LOGS/moonbase-$(installed_version moonbase)")
       # don't forget zlocal:
       if [ "$ZLOCAL_OVERRIDES" == "on" ] ; then
         DEPFILES="$DEPFILES $(find $MOONBASE/zlocal -type f -name DEPENDS)"
@@ -543,7 +543,7 @@ update_depends()
 list_installed_depending() {
   local SUBDEP
   debug_msg "list_installed_depending($2)"
-  for SUBDEP in $(grep ":$1:" "$DEPENDS_CACHE" | cut -d: -f1) ; do
+  for SUBDEP in $(fgrep ":$1:" "$DEPENDS_CACHE" | cut -d: -f1) ; do
     if $(module_installed $SUBDEP ) ; then
       list_installed_depending $SUBDEP | sort | uniq
       echo $SUBDEP

diff --git a/libs/download.lunar b/libs/download.lunar
@@ -19,7 +19,7 @@ lget_lock() {
 lget_locked() {
 	debug_msg "lget_locked ($@)"
 	if [ -f "/var/lock/lgetting.$MODULE" ] &&
-			ps `cat "/var/lock/lgetting.$MODULE"` | grep	-q	"lget" ; then
+			ps `cat "/var/lock/lgetting.$MODULE"` | fgrep -wq 'lget' ; then
 		true
 	else
 		false
@@ -84,7 +84,7 @@ download_module() {
 
 		add_url() {
 			if [ -n "$1" ]; then
-				if ! echo " $ALL_URLS " | grep -q " $1 "; then
+				if ! echo " $ALL_URLS " | fgrep -q " $1 "; then
 					ALL_URLS="$ALL_URLS $1"
 				fi
 			fi
@@ -119,7 +119,7 @@ download_module() {
 
 				# scan for hits against known clusters of mirrors
 				for MLIST in $MIRRORS/*; do
-					for ALT in $(sed 's/.*\t\([^\t]*\)$/\1/g' "$MLIST" | grep -v "^Custom$"); do
+					for ALT in $(sed 's/.*\t\([^\t]*\)$/\1/g' "$MLIST" | fgrep -xv 'Custom'); do
 						if [ "${URL:0:${#ALT}}" == "$ALT" ] ; then
 							# compose the list of valid mirrors
 							REST=${URL:${#ALT}}
@@ -166,25 +166,25 @@ testpack () {
 		FILEMAGIC=$(file -b $FILENAME)
 		case $FILENAME in
 			*.bz2|*.BZ2)
-				echo $FILEMAGIC | grep -qw "bzip2"
+				echo $FILEMAGIC | fgrep -qw 'bzip2'
 				;;
 			*.gz|*.GZ|*.tgz|*.TGZ)
-				echo $FILEMAGIC | grep -qw "gzip"
+				echo $FILEMAGIC | fgrep -qw 'gzip'
 				;;
 			*.z|*.Z)
-				echo $FILEMAGIC | grep -qw "compress"
+				echo $FILEMAGIC | fgrep -qw 'compress'
 				;;
 			*.zip|*.ZIP)
-				echo $FILEMAGIC | grep -qw "Zip"
+				echo $FILEMAGIC | fgrep -qw 'Zip'
 				;;
 			*.rpm|*.RPM)
-				echo $FILEMAGIC | grep -qw "RPM"
+				echo $FILEMAGIC | fgrep -qw 'RPM'
 				;;
 			*.CAB|*.cab)
-				echo $FILEMAGIC | grep -qw "Cabinet"
+				echo $FILEMAGIC | fgrep -qw 'Cabinet'
 				;;
 			*.xz|*.XZ)
-				echo $FILEMAGIC | grep -qw "XZ"
+				echo $FILEMAGIC | fgrep -qw 'XZ'
 				;;
 			*)
 				# we don't know how to handle this type of file

diff --git a/libs/edit.lunar b/libs/edit.lunar
@@ -26,7 +26,7 @@ patch_it () {
     PATCH="$1"
   fi
 
-  if [[ -n `echo $PATCH | grep '\.tar'` ]] ; then
+  if [[ -n `echo $PATCH | fgrep '.tar'` ]] ; then
     TARCMD="tar x -O"
   else
     TARCMD="cat"

diff --git a/libs/kernel.lunar b/libs/kernel.lunar
@@ -93,11 +93,11 @@ kernel_option_present() {
     esac
 
     if [ -n "$KERNEL_VALUE" ]; then
-      if $CAT "$KERNEL_CONFIG" | grep -Eq "^$KERNEL_OPTION=\"$KERNEL_VALUE\""; then
+      if $CAT "$KERNEL_CONFIG" | grep -q "^$KERNEL_OPTION=\"$KERNEL_VALUE\""; then
         return 0
       fi
     else
-      if $CAT "$KERNEL_CONFIG" | grep -Eq "^$KERNEL_OPTION=(y|m)$"; then
+      if $CAT "$KERNEL_CONFIG" | grep -q "^$KERNEL_OPTION=[ym]$"; then
         return 0
       fi
     fi

diff --git a/libs/locking.lunar b/libs/locking.lunar
@@ -94,7 +94,7 @@ lin_locked()  {
   debug_msg "lin_locked ($@)"
   [     -f        /var/lock/installing.$1  ]  &&
   ps        `cat "/var/lock/installing.$1"`    |
-  grep  -q  "lin"
+  fgrep  -wq  'lin'
 }
 
 

diff --git a/libs/logging.lunar b/libs/logging.lunar
@@ -46,7 +46,7 @@ progress() {
     X="############################################################"
     Y="                                                            "
     OLDSZ=$(xzbz -dc $OLDLOG | wc -c)
-    OLDTIMES=($(xzbz -dc $OLDLOG | grep 'Mark Compile ' | cut -d \" -f6 | while read TIME ; do date +%s -d "$TIME" ; done))
+    OLDTIMES=($(xzbz -dc $OLDLOG | fgrep 'Mark Compile ' | cut -d \" -f6 | while read TIME ; do date +%s -d "$TIME" ; done))
     CTIME=$((${OLDTIMES[1]} - ${OLDTIMES[0]}))
     echo "Last compile time: $((CTIME / 60))m$((CTIME % 60))s"
     while true ; do

diff --git a/libs/messages.lunar b/libs/messages.lunar
@@ -81,7 +81,7 @@ debug_msg() {
       fi
       set | grep '^[A-Z]' | sed 's/^/VAR /' > $TMPDIR/l_debug_var.$$
       diff -U0 $TMPDIR/l_debug_var.$$.old $TMPDIR/l_debug_var.$$ | \
-          grep -v "^@@" | grep "VAR" | tee -a $TMPDIR/lp_debuglog.$$ >&2
+          grep -v '^@@' | fgrep 'VAR' | tee -a $TMPDIR/lp_debuglog.$$ >&2
     fi
   fi
 }

diff --git a/libs/misc.lunar b/libs/misc.lunar
@@ -32,7 +32,7 @@ ld_add() {
 	debug_msg "ld_add ($@)"
 
 	if [ ! -z "$1" ] && [ -d "$1" ] ; then
-		if ! grep -q "$1" /etc/ld.so.conf; then
+		if ! fgrep -xq "$1" /etc/ld.so.conf; then
 			verbose_msg "Adding $1 to ld.so.conf"
 			echo "$1" >> /etc/ld.so.conf
 			ldconfig
@@ -48,12 +48,12 @@ ld_remove() {
 	debug_msg "ld_remove ($@)"
 
 	if [ ! -z "$1" ]; then
-		if grep -q "$1" /etc/ld.so.conf ; then
+		if fgrep -xq "$1" /etc/ld.so.conf ; then
 
 			TMP_LD_CONF=$(temp_create "ldsoconf")
 			verbose_msg "Removing $1 from ld.so.conf"
 
-			grep -v "$1" /etc/ld.so.conf > $TMP_LD_CONF
+			fgrep -xv "$1" /etc/ld.so.conf > $TMP_LD_CONF
 			cat "$TMP_LD_CONF" > /etc/ld.so.conf
 			ldconfig
 
@@ -207,9 +207,9 @@ custom_filters()
 last_kernel()
 {
 	if [ -f /usr/src/linux/include/linux/utsrelease.h ]; then
-		grep UTS_RELEASE /usr/src/linux/include/linux/utsrelease.h | cut -d'"' -f2
+		fgrep UTS_RELEASE /usr/src/linux/include/linux/utsrelease.h | cut -d'"' -f2
 	else
-		grep UTS_RELEASE /usr/src/linux/include/linux/version.h | cut -d'"' -f2
+		fgrep UTS_RELEASE /usr/src/linux/include/linux/version.h | cut -d'"' -f2
 	fi
 }