diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 12:17:38 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 12:17:38 -0300 |
commit | 560d8b718c59acf36fb76b9766add53434c98b1d (patch) | |
tree | 21199c8102f85f5c1921653d16978b8c8e1591df /db-check-nonfree | |
parent | 9612e5d915faf63ea6d5a5ca5c3ff74cca8eb923 (diff) | |
parent | e9d0581b173853e647b36caa170b7c4bbee43643 (diff) |
Merge branch 'master' of https://projects.parabolagnulinux.org/dbscripts
Conflicts:
config
Diffstat (limited to 'db-check-nonfree')
-rwxr-xr-x | db-check-nonfree | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/db-check-nonfree b/db-check-nonfree index d8f34f0..ab6491d 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -23,11 +23,17 @@ for repo in ${ARCHREPOS[@]}; do if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then continue fi + unset dbpkgs unset cleanpkgs - cmd_="$(dirname $0)/list_nonfree_in_db.py -k ${BLACKLIST_FILE} \ - -b ${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" - cleanpkgs=($(${cmd_})) + cleanpkgs=() + dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort -u )) + for pkgname in ${dbpkgs[@]}; do + if in_array ${pkgname} ${nonfree[@]}; then + cleanpkgs+=(${pkgname}) + fi + done if [ ${#cleanpkgs[@]} -ge 1 ]; then + msg2 "Unfree: ${cleanpkgs[@]}" arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} fi done |