Miroirs/slackpkg
1
0
Fork 0
mirror of https://github.com/rworkman/slackpkg synced 2024-11-15 19:47:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for /var/log/packages/ possibly being a symlink to elsewhere

Browse source
This commit is contained in:
Robby Workman 2018-06-07 23:00:02 -05:00
parent e1fc7d9987
commit 10b2f7d493
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
files/core-functions.sh
View file

@ -805,7 +805,7 @@ function searchlist() {
# First is the package already installed?
# Amazing what a little sleep will do
# exclusion is so much nicer :)
INSTPKG=$(ls -1 $ROOT/var/log/packages | \
INSTPKG=$(ls -1 $ROOT/var/log/packages/ | \
grep -e "^${BASENAME}-[^-]\+-\(${ARCH}\|fw\|noarch\)-[^-]\+")
# INSTPKG is local version
@ -1199,14 +1199,14 @@ function sanity_check() {
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
for i in $(ls -1 $ROOT/var/log/packages | \
for i in $(ls -1 $ROOT/var/log/packages/ | \
egrep -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do
REVNAME=$(echo ${i} | awk -F'-upgraded' '{ print $1 }')
mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME}
mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME}
done
ls -1 $ROOT/var/log/packages | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \
ls -1 $ROOT/var/log/packages/ | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \
batchcutpkg | sort > $TMPDIR/list1
cat $TMPDIR/list1 | uniq > $TMPDIR/list2
FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )"
@ -1223,12 +1223,12 @@ function sanity_check() {
if [ "$DOUBLEFILES" != "" ]; then
echo -e "\
You have a broken $ROOT/var/log/packages - with two versions of the same package.\n\
You have a broken $ROOT/var/log/packages/ - with two versions of the same package.\n\
The list of packages duplicated in your machine are shown below, but don't\n\
worry about this list - when you select your action, slackpkg will show a\n\
better list:\n"
for i in $DOUBLEFILES ; do
ls -1 $ROOT/var/log/packages |\
ls -1 $ROOT/var/log/packages/ |\
egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-"
done
echo -ne "\n\
@ -1243,7 +1243,7 @@ Select your action (B/R/I): "
;;
R|r)
for i in $DOUBLEFILES ; do
FILE=$(ls -1 $ROOT/var/log/packages |\
FILE=$(ls -1 $ROOT/var/log/packages/ |\
egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-")
FILES="$FILES $FILE"
done

2
files/dialog-functions.sh
View file

@ -20,7 +20,7 @@ if [ "$DIALOG" = "on" ] || [ "$DIALOG" = "ON" ]; then
rm -f $TMPDIR/dialog.tmp
if [ "$2" = "upgrade" ]; then
ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist
ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist
for i in $1; do
BASENAME=$(cutpkg $i)
PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-\(noarch\|fw\|${ARCH}\)" $TMPDIR/tmplist)