moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-10-31 15:45:03 -04:00
Code Issues Releases Wiki Activity

makepkg: replace unnecessary uses of grep

Browse Source 
Signed-off-by: Andres P <aepd87@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Andres P 2010-05-22 00:36:52 -04:30 committed by Dan McGee
parent 3cd237dec3
commit ae73d75660
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/makepkg.sh.in
View File

@ -318,12 +318,12 @@ download_file() {
local dlfile="${url##*/}" local dlfile="${url##*/}"
# replace %o by the temporary dlfile if it exists # replace %o by the temporary dlfile if it exists
if echo "$dlcmd" | grep -q "%o" ; then if [[ $dlcmd = *%o* ]]; then
dlcmd=${dlcmd//\%o/\"$file.part\"} dlcmd=${dlcmd//\%o/\"$file.part\"}
dlfile="$file.part" dlfile="$file.part"
fi fi
# add the URL, either in place of %u or at the end # add the URL, either in place of %u or at the end
if echo "$dlcmd" | grep -q "%u" ; then if [[ $dlcmd = *%u* ]]; then
dlcmd=${dlcmd//\%u/\"$url\"} dlcmd=${dlcmd//\%u/\"$url\"}
else else
dlcmd="$dlcmd \"$url\"" dlcmd="$dlcmd \"$url\""
@ -1107,7 +1107,7 @@ create_srcpackage() {
fi fi
done done
local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) local install_files=( $(sed -n "s/^\([[:space:]]*\)install=/\1/p" "$BUILDSCRIPT") )
if [[ -n $install_files ]]; then if [[ -n $install_files ]]; then
local file local file
for file in ${install_files[@]}; do for file in ${install_files[@]}; do
@ -1120,7 +1120,7 @@ create_srcpackage() {
done done
fi fi
local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) local changelog_files=( $(sed -n "s/^\([[:space:]]*\)changelog=/\1/p" "$BUILDSCRIPT") )
if [[ -n $changelog_files ]]; then if [[ -n $changelog_files ]]; then
local file local file
for file in ${changelog_files[@]}; do for file in ${changelog_files[@]}; do
@ -1250,7 +1250,7 @@ check_sanity() {
fi fi
done done
local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) local install_files=( $(sed -n "s/^\([[:space:]]*\)install=/\1/p" "$BUILDSCRIPT") )
if [[ -n $install_files ]]; then if [[ -n $install_files ]]; then
local file local file
for file in ${install_files[@]}; do for file in ${install_files[@]}; do
@ -1263,7 +1263,7 @@ check_sanity() {
done done
fi fi
local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) local changelog_files=( $(sed -n "s/^\([[:space:]]*\)changelog=/\1/p" "$BUILDSCRIPT") )
if [[ -n $changelog_files ]]; then if [[ -n $changelog_files ]]; then
for file in ${changelog_files[@]}; do for file in ${changelog_files[@]}; do
# evaluate any bash variables used # evaluate any bash variables used
@ -1572,7 +1572,7 @@ OPT_LONG="$OPT_LONG,source,syncdeps,version,config:"
# Pacman Options # Pacman Options
OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" OPT_LONG="$OPT_LONG,noconfirm,noprogressbar"
OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')"
if echo "$OPT_TEMP" | grep -q 'PARSE_OPTIONS FAILED'; then if [[ $OPT_TEMP = *'PARSE_OPTIONS FAILED'* ]]; then
# This is a small hack to stop the script bailing with 'set -e' # This is a small hack to stop the script bailing with 'set -e'
echo; usage; exit 1 # E_INVALID_OPTION; echo; usage; exit 1 # E_INVALID_OPTION;
fi fi