diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-05-08 17:11:55 -0700 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-05-08 17:11:55 -0700 |
commit | cfb42f6cff6a6161dd7ecf9ac75eadad8af12ca9 (patch) | |
tree | 78f0b3c13c49bddf2c0e758e92ada6aa61745753 | |
parent | 4b2bd9a51f8f59106234f8889ae0ad98598f33bc (diff) | |
parent | 74093d95cba935badaf7572e1dcd38ffd76bdc53 (diff) |
Merge branch 'master' of http://projects.parabolagnulinux.org/dbscripts
-rw-r--r-- | config | 1 | ||||
-rwxr-xr-x | db-update | 17 |
2 files changed, 17 insertions, 1 deletions
@@ -33,3 +33,4 @@ PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="$HOME/etc/makepkg.conf" +BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt"
\ No newline at end of file @@ -69,7 +69,7 @@ for repo in ${repos[@]}; do if [ -f "$FTP_BASE/${PKGPOOL}/${pkgfile}.sig" ]; then ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "$FTP_BASE/$repo/os/${pkgarch}" fi - add_pkgs[${#add_pkgs[*]}]=${pkgfile} + add_pkgs[${#add_pkgs[*]}]=${pkgfile} done if [ ${#add_pkgs[@]} -ge 1 ]; then arch_repo_add "${repo}" "${pkgarch}" ${add_pkgs[@]} @@ -77,6 +77,21 @@ for repo in ${repos[@]}; do done done +# Repo check nonfree +nonfree=($(cut -d: -f1 ${BLACKLIST_FILE})) +for repo in ${ARCHREPOS[@]}; do + for pkgarch in ${ARCHARCHES[@]}; do + cleanpkgs=() + dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort )) + for pkgname in ${dbpkgs[@]}; do + if in_array ${pkgname} ${nonfree[@]}; then + cleanpkgs[${#cleanpkgs[*]}]=${pkgname} + fi + done + arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} + done +done + for repo in ${repos[@]}; do for pkgarch in ${ARCHES[@]}; do repo_unlock ${repo} ${pkgarch} |