moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

repo-add : fix package variables declaration

Browse Source 
- arch was missing

- backup is not used by repo-add. However makepkg still needs to put it in
  PKGINFO because pacman uses it

- startdir is no longer used after the new delta implementation

- the declaration of group, depend, backup, etc is not needed because these
  variables are always declared before being used :
	declare $var="$val"
	case "$var" in
		group)    _groups="$_groups$group\n" ;;

- reorder the variables declaration to follow the same order than they are
  written to the depends and desc file, for making future checks easier

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
This commit is contained in:
Xavier Chantry 2009-02-27 15:18:10 +01:00
parent bbcf96230a
commit a556bc57fc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/repo-add.sh.in
View File

@ -180,10 +180,8 @@ db_write_entry()
{
# blank out all variables
local pkgfile="$1"
local pkgname pkgver pkgdesc url builddate packager csize size \
group depend backup license replaces provides conflict force \
_groups _depends _backups _licenses _replaces _provides _conflicts \
startdir optdepend _optdepends md5sum
local pkgname pkgver pkgdesc csize size md5sum url arch builddate packager force \
_groups _licenses _replaces _depends _conflicts _provides _optdepends
local OLDIFS="$IFS"
# IFS (field separator) is only the newline character
@ -200,12 +198,11 @@ db_write_entry()
declare $var="$val"
case "$var" in
group) _groups="$_groups$group\n" ;;
depend) _depends="$_depends$depend\n" ;;
backup) _backups="$_backups$backup\n" ;;
license) _licenses="$_licenses$license\n" ;;
replaces) _replaces="$_replaces$replaces\n" ;;
provides) _provides="$_provides$provides\n" ;;
depend) _depends="$_depends$depend\n" ;;
conflict) _conflicts="$_conflicts$conflict\n" ;;
provides) _provides="$_provides$provides\n" ;;
optdepend) _optdepends="$_optdepends$optdepend\n" ;;
esac
done
@ -222,7 +219,6 @@ db_write_entry()
return 1
fi
startdir=$(pwd)
pushd "$gstmpdir" 2>&1 >/dev/null
if [ -d "$pkgname-$pkgver" ]; then