From b88a0166be595545c2b2d68451291f8ba6bb08ab Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernandez Date: Wed, 18 May 2011 21:21:59 -0500 Subject: * Separated nonfree check from db-update * Added db-check-nonfree to repo-update --- db-check-nonfree | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 db-check-nonfree (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree new file mode 100644 index 0000000..83efb14 --- /dev/null +++ b/db-check-nonfree @@ -0,0 +1,45 @@ +#!/bin/bash + +. "$(dirname $0)/db-functions" +. "$(dirname $0)/config" + +if [ $# -ge 1 ]; then + warning "Calling $(basename $0) with a specific repository is not supported" + exit 1 +fi + +# TODO: this might lock too much (architectures) +for repo in ${repos[@]}; do + for pkgarch in ${ARCHES[@]}; do + repo_lock ${repo} ${pkgarch} || exit 1 + done +done + +msg "Check nonfree in repo:" +nonfree=($(cut -d: -f1 ${BLACKLIST_FILE} | sort -u)) +for repo in ${ARCHREPOS[@]}; do + for pkgarch in ${ARCHES[@]}; do + msg2 "$repo $pkgarch" + if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then + continue + fi + unset dbpkgs + unset cleanpkgs + 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[${#cleanpkgs[*]}]=${pkgname} + fi + done + if [ ${#cleanpkgs[@]} -ge 1 ]; then + arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} + fi + done +done + +for repo in ${repos[@]}; do + for pkgarch in ${ARCHES[@]}; do + repo_unlock ${repo} ${pkgarch} + done +done -- cgit v1.2.3-2-g168b From 8766129748c8ad165b4245f53df1a2466be30848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Wed, 18 May 2011 19:28:28 -0700 Subject: db-check-nonfree is executable --- db-check-nonfree | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 db-check-nonfree (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree old mode 100644 new mode 100755 -- cgit v1.2.3-2-g168b From dead95b06c2a547f3cfae6c5acc21859cdd30d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Fri, 10 Jun 2011 16:33:28 -0500 Subject: * Use python for identify nonfree in db-check-nonfree --- db-check-nonfree | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index 83efb14..d8f34f0 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -23,15 +23,10 @@ for repo in ${ARCHREPOS[@]}; do if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then continue fi - unset dbpkgs unset cleanpkgs - 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[${#cleanpkgs[*]}]=${pkgname} - fi - done + cmd_="$(dirname $0)/list_nonfree_in_db.py -k ${BLACKLIST_FILE} \ + -b ${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" + cleanpkgs=($(${cmd_})) if [ ${#cleanpkgs[@]} -ge 1 ]; then arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} fi -- cgit v1.2.3-2-g168b From 7e8840e0a76d28c27ed7efc041106d338ca0c607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Mon, 13 Jun 2011 08:17:13 -0700 Subject: repos are working fine like this --- db-check-nonfree | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index d8f34f0..83efb14 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -23,10 +23,15 @@ 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[${#cleanpkgs[*]}]=${pkgname} + fi + done if [ ${#cleanpkgs[@]} -ge 1 ]; then arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} fi -- cgit v1.2.3-2-g168b From 178c720a4c2fd8adf20e6109784c39cc27dd6b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2011 12:35:46 -0700 Subject: Inform found packages --- db-check-nonfree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index 83efb14..ab6491d 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -29,10 +29,11 @@ for repo in ${ARCHREPOS[@]}; do 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[${#cleanpkgs[*]}]=${pkgname} + cleanpkgs+=(${pkgname}) fi done if [ ${#cleanpkgs[@]} -ge 1 ]; then + msg2 "Unfree: ${cleanpkgs[@]}" arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} fi done -- cgit v1.2.3-2-g168b From 2a4a1c4015a4cc48f1613b7fd360148378775445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Wed, 21 Aug 2013 17:48:40 -0300 Subject: rename unfree to nonfree --- db-check-nonfree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index ab6491d..ecad3b9 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -33,7 +33,7 @@ for repo in ${ARCHREPOS[@]}; do fi done if [ ${#cleanpkgs[@]} -ge 1 ]; then - msg2 "Unfree: ${cleanpkgs[@]}" + msg2 "Nonfree: ${cleanpkgs[@]}" arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} fi done -- cgit v1.2.3-2-g168b From 6a093f1dc6bd5398115544dd229b520f9432e122 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 31 Dec 2013 15:49:06 -0500 Subject: use `readlink -e` on $0 --- db-check-nonfree | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index ecad3b9..ba5f5aa 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -1,7 +1,7 @@ #!/bin/bash -. "$(dirname $0)/db-functions" -. "$(dirname $0)/config" +. "$(dirname "$(readlink -e "$0")")/db-functions" +. "$(dirname "$(readlink -e "$0")")/config" if [ $# -ge 1 ]; then warning "Calling $(basename $0) with a specific repository is not supported" -- cgit v1.2.3-2-g168b From 12507975408257ff24f1f367b8b3b842fa779f1f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 31 Dec 2013 17:12:16 -0500 Subject: use ${0##*/} instead of basename in "usage:" text --- db-check-nonfree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index ba5f5aa..661daa6 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -4,7 +4,7 @@ . "$(dirname "$(readlink -e "$0")")/config" if [ $# -ge 1 ]; then - warning "Calling $(basename $0) with a specific repository is not supported" + warning "Calling ${0##*/} with a specific repository is not supported" exit 1 fi -- cgit v1.2.3-2-g168b From e7d2dcac7cf857fdccd82bec2bfc2a7d8e6b85c6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 8 Jan 2014 16:53:56 -0500 Subject: Normalize to load ./config before loading ./db-functions --- db-check-nonfree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index 661daa6..5cb7f6f 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -1,7 +1,7 @@ #!/bin/bash -. "$(dirname "$(readlink -e "$0")")/db-functions" . "$(dirname "$(readlink -e "$0")")/config" +. "$(dirname "$(readlink -e "$0")")/db-functions" if [ $# -ge 1 ]; then warning "Calling ${0##*/} with a specific repository is not supported" -- cgit v1.2.3-2-g168b From 39fbf0d8d3cdc666912c597d41d5b6a70fc0c725 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 8 Jan 2014 20:53:38 -0500 Subject: Fix some array quoting. --- db-check-nonfree | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'db-check-nonfree') diff --git a/db-check-nonfree b/db-check-nonfree index 5cb7f6f..6e2dc17 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -9,16 +9,16 @@ if [ $# -ge 1 ]; then fi # TODO: this might lock too much (architectures) -for repo in ${repos[@]}; do - for pkgarch in ${ARCHES[@]}; do +for repo in "${repos[@]}"; do + for pkgarch in "${ARCHES[@]}"; do repo_lock ${repo} ${pkgarch} || exit 1 done done msg "Check nonfree in repo:" nonfree=($(cut -d: -f1 ${BLACKLIST_FILE} | sort -u)) -for repo in ${ARCHREPOS[@]}; do - for pkgarch in ${ARCHES[@]}; do +for repo in "${ARCHREPOS[@]}"; do + for pkgarch in "${ARCHES[@]}"; do msg2 "$repo $pkgarch" if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then continue @@ -27,20 +27,20 @@ for repo in ${ARCHREPOS[@]}; do unset cleanpkgs 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}) + for pkgname in "${dbpkgs[@]}"; do + if in_array "${pkgname}" "${nonfree[@]}"; then + cleanpkgs+=("${pkgname}") fi done if [ ${#cleanpkgs[@]} -ge 1 ]; then - msg2 "Nonfree: ${cleanpkgs[@]}" - arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} + msg2 "Nonfree: ${cleanpkgs[*]}" + arch_repo_remove "${repo}" "${pkgarch}" "${cleanpkgs[@]}" fi done done -for repo in ${repos[@]}; do - for pkgarch in ${ARCHES[@]}; do +for repo in "${repos[@]}"; do + for pkgarch in "${ARCHES[@]}"; do repo_unlock ${repo} ${pkgarch} done done -- cgit v1.2.3-2-g168b