mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-09-19 22:40:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

sbopkg: Fix path.

Browse Source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Matteo Bernardini 2018-06-26 05:14:44 +07:00 committed by Willy Sudiarto Raharjo
parent fb9d86faf0
commit e43d08ec66
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/usr/sbin/sbopkg
View File

@ -491,7 +491,7 @@ mk_pkg_lists() {
# least for right now, this is purely an auxilary function called from # least for right now, this is purely an auxilary function called from
# list_packages(). # list_packages().
find /var/log/packages -type f -name "*$REPO_TAG" \ find /var/log/packages/ -type f -name "*$REPO_TAG" \
-printf "%P\n" 2> /dev/null | sort > $PKG_LIST -printf "%P\n" 2> /dev/null | sort > $PKG_LIST
sed 's/$/ "" OFF/' $PKG_LIST > $PKG_CHECKLIST sed 's/$/ "" OFF/' $PKG_LIST > $PKG_CHECKLIST
nvabt2n $PKG_LIST $README_LIST nvabt2n $PKG_LIST $README_LIST
@ -694,7 +694,7 @@ get_old_name() {
# Reading from $substitutions... # Reading from $substitutions...
while read CANDIDATE; do while read CANDIDATE; do
[[ -z "$CANDIDATE" ]] && continue [[ -z "$CANDIDATE" ]] && continue
INSTALLED=$(ls /var/log/packages | INSTALLED=$(ls /var/log/packages/ |
grep -x "$CANDIDATE-[^-]*-[^-]*-[^-]*") grep -x "$CANDIDATE-[^-]*-[^-]*-[^-]*")
if [[ -n "$INSTALLED" ]]; then if [[ -n "$INSTALLED" ]]; then
# Old-named installed package found, assume this is the correct # Old-named installed package found, assume this is the correct
@ -1250,7 +1250,7 @@ info_item() {
while :; do while :; do
# we use GNU grep extensions rather than egrep to avoid issues with # we use GNU grep extensions rather than egrep to avoid issues with
# the '+' metacharacter which can be found in package names # the '+' metacharacter which can be found in package names
INSTALLEDPACKAGE=$(ls /var/log/packages | INSTALLEDPACKAGE=$(ls /var/log/packages/ |
grep "^\($APP\|$OLDPKG\)-[^-]*-[^-]*-[^-]*\$") grep "^\($APP\|$OLDPKG\)-[^-]*-[^-]*-[^-]*\$")
# Only get the first package (not that the same package should be # Only get the first package (not that the same package should be
# installed more than once on a sane system...) # installed more than once on a sane system...)
@ -2129,7 +2129,7 @@ add_item_to_queue() {
# note that this regex was missing the ^ as of r826 and this caused a # note that this regex was missing the ^ as of r826 and this caused a
# false match when running 'sbopkg -k -i queue' because 'foo' and # false match when running 'sbopkg -k -i queue' because 'foo' and
# 'libfoo' matched # 'libfoo' matched
INSTALLED=$(ls -1 /var/log/packages | INSTALLED=$(ls -1 /var/log/packages/ |
grep "^$APP-[^-]*-[^-]*-[^-]*$REPO_TAG$") grep "^$APP-[^-]*-[^-]*-[^-]*$REPO_TAG$")
if [[ -n $INSTALLED ]]; then if [[ -n $INSTALLED ]]; then
VERSION=$(sed 's:^.*-\([^-]*\)-[^-]*-[^-]*$:\1:'<<<$INSTALLED) VERSION=$(sed 's:^.*-\([^-]*\)-[^-]*-[^-]*$:\1:'<<<$INSTALLED)