using 'grep -E' instead of 'egrep'

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@659 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index c0cdec8426e80d8c80cf846e0b92602dd239a5ba..e8047fcd7d0204e1b3fa26778aeca8f91fbe1852 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -141,7 +141,7 @@ function solve_dep {
 
   # Check package in local system
   PACK="`echo $PACK | sed -e 's/\+/\\\+/'`"
-  INSTALLED=`eval "ls /var/log/packages/ | egrep -E '^$PACK-[^-]+-[^-]+-[^-]+$'"`
+  INSTALLED=`eval "ls /var/log/packages/ | grep -E '^$PACK-[^-]+-[^-]+-[^-]+$'"`
   CHECK=$?
 
   # TODO: Make check version procedures

diff --git a/trunk/src/lspkg b/trunk/src/lspkg
index ce7b3b96f10082a011313ddf41469d15c2746772..e35baea5fffbfe93222ba4e8a11bfe521101f566 100755 (executable)
--- a/trunk/src/lspkg
+++ b/trunk/src/lspkg
@@ -61,7 +61,7 @@ if [ ! -z "$pack" ]; then
     LIST_PKGS="`ls -1 /$ROOT/$PKG_LIST_DIR/$pack 2> /dev/null`"
   else
     pack="`echo $pack | sed -e 's/\+/\\\+/'`"
-    LIST_PKGS=`eval "ls -1 /$ROOT/$PKG_LIST_DIR/ 2> /dev/null | egrep -E '^$pack-[^-]+-[^-]+-[^-]+$'"`
+    LIST_PKGS=`eval "ls -1 /$ROOT/$PKG_LIST_DIR/ 2> /dev/null | grep -E '^$pack-[^-]+-[^-]+-[^-]+$'"`
   fi
 else
   LIST_PKGS="`ls /$ROOT/$PKG_LIST_DIR/ 2> /dev/null`"

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index e1390a9d5e74b267a2318dfd4175f4a1ff98f7e8..228d7b00040c6530b63a29f333f9f84a910831d8 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -587,7 +587,7 @@ function submit_slackbuild {
   # check and add slack-required
   [ -e $WORK/slack-required ] && svn_copy $WORK/slack-required $SLACKBUILD_PATH
 
-  for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do
+  for i in `ls $WORK | grep -E -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do
     svn_copy $WORK/$i $SLACKBUILD_PATH
   done
 
@@ -628,7 +628,7 @@ function submit_mkbuild {
   # add mkbuild
   svn_copy $WORK/$MKBUILD_NAME $MKBUILD_PATH
 
-  for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do
+  for i in `ls $WORK | grep -E -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do
     svn_copy $WORK/$i $MKBUILD_PATH
   done
 

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 700c3bc28d91136ac8dcd9ce80ae9ad4100211fd..236b4bccc84d18882913409246053026b7c03467 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -371,7 +371,7 @@ function simplaret_search {
           done
           # now we should return all matches that are not part of ROOT_PRIORITY
           priority_match="`echo $priority_match | sed -e 's/^|//'`"
-          for file in `simplaret_find_package $pattern $storage/$repository_name | egrep -v $priority_match`; do
+          for file in `simplaret_find_package $pattern $storage/$repository_name | grep -E -v $priority_match`; do
             simplaret_show_package $file $mode
           done
           priority_match=""
@@ -385,7 +385,7 @@ function simplaret_search {
           done
           # now we should return all matches that are not part of REPOS_PRIORITY
           priority_match="`echo $priority_match | sed -e 's/^|//'`"
-          for file in `simplaret_find_package $pattern $storage/$repository_name | egrep -v $priority_match`; do
+          for file in `simplaret_find_package $pattern $storage/$repository_name | grep -E -v $priority_match`; do
             simplaret_show_package $file $mode
           done 
           priority_match=""
@@ -728,7 +728,7 @@ function simplaret_search_and_process_patch {
     fi
 
     pack="`echo $sugested_pack | sed -e 's/\+/\\\+/'`"
-    installed=`eval "ls $root/var/log/packages/ | egrep -E '^$pack-[^-]+-[^-]+-[^-]+$'"`
+    installed=`eval "ls $root/var/log/packages/ | grep -E '^$pack-[^-]+-[^-]+-[^-]+$'"`
     installed_version="`package_version $installed.tgz`"
     installed_build="`package_build $installed.tgz`"
 
@@ -1076,7 +1076,7 @@ function simplaret_solve_dep {
   local root="/$3"
 
   pack="`echo $pack| sed -e 's/\+/\\\+/'`"
-  installed=`eval "ls $root/var/log/packages/ | egrep -E '^$pack-[^-]+-[^-]+-[^-]+$'"`
+  installed=`eval "ls $root/var/log/packages/ | grep -E '^$pack-[^-]+-[^-]+-[^-]+$'"`
   check=$?
 
   if [ -z "$installed" ]; then