On Thu, Jun 17, 2010 at 7:44 AM, Andres P <[email protected]> wrote: > Use foo+=bar instead of foo=${foo}bar > > Signed-off-by: Andres P <[email protected]> > ---
Signed-off-by: Dan McGee <[email protected]> > scripts/makepkg.sh.in | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index 991ad0f..cf23fdb 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -1149,9 +1149,9 @@ install_package() { > local pkg pkglist > for pkg in ${pkgna...@]}; do > if [[ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} > ]]; then > - pkglist="${pkglist} > $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" > + pkglist+=" > $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" > else > - pkglist="${pkglist} > $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" > + pkglist+=" > $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" > fi > done > > @@ -1521,11 +1521,11 @@ ARGLIST=("$@") > # Parse Command Line Options. > OPT_SHORT="AcCdefFghiLmop:rRsV" > OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" > -OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" > -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" > -OPT_LONG="$OPT_LONG,source,syncdeps,version,config:" > +OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" > +OPT_LONG+=",install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" > +OPT_LONG+=",source,syncdeps,version,config:" > # Pacman Options > -OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" > +OPT_LONG+=",noconfirm,noprogressbar" > OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS > FAILED')" > if [[ $OPT_TEMP = *'PARSE_OPTIONS FAILED'* ]]; then > # This is a small hack to stop the script bailing with 'set -e' > @@ -1537,8 +1537,8 @@ unset OPT_SHORT OPT_LONG OPT_TEMP > while true; do > case "$1" in > # Pacman Options > - --noconfirm) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; > - --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" > ;; > + --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; > + --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; > > # Makepkg Options > --allsource) SOURCEONLY=2 ;; > -- > 1.7.1 > > >
