aboutsummaryrefslogtreecommitdiff
path: root/trunk/src
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-15 02:17:04 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-15 02:17:04 +0000
commit53a0c5f4ce910582f0408dc75ad2613f49f8987a (patch)
tree888bf93162fa8b283906434ce8a9cdca6d3437f5 /trunk/src
parentb460c618df36b51e96fcb42349735f7aa785090c (diff)
downloadsimplepkg-53a0c5f4ce910582f0408dc75ad2613f49f8987a.tar.gz
simplepkg-53a0c5f4ce910582f0408dc75ad2613f49f8987a.tar.bz2
using 'grep -E' instead of 'egrep'
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@659 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src')
-rw-r--r--trunk/src/createpkg2
-rwxr-xr-xtrunk/src/lspkg2
-rwxr-xr-xtrunk/src/mkbuild4
-rwxr-xr-xtrunk/src/simplaret8
4 files changed, 8 insertions, 8 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index c0cdec8..e8047fc 100644
--- 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 ce7b3b9..e35baea 100755
--- 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 e1390a9..228d7b0 100755
--- 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 700c3bc..236b4bc 100755
--- 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