summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--slackupgrade2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4d67620..632b95d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,13 @@
PACKAGE = slackupgrade
VERSION = 1.0
SBINDIR = /sbin
MANDIR = /usr/man
MAN8DIR = $(MANDIR)/man8
-CONFDIR = /etc/slackware-system-upgrade
+CONFDIR = /etc/$(PACKAGE)
CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl
help:;
@echo "Avalable targets:"
@echo ""
@echo "$$ make install"
diff --git a/slackupgrade b/slackupgrade
index 30bfa9c..e4335a0 100644
--- a/slackupgrade
+++ b/slackupgrade
@@ -573,13 +573,13 @@ do
dropfile $file
done
# Build a list of installed packages
ls /var/log/packages |\
sed -r -e 's/-[^-]+-(i386|x86(_64)?|arm|noarch|fw)-[[:digit:]]+(_.*)?//' |\
- sort > $installed_list
+ sort -u > $installed_list
# Build a list of packages to install
(if [ -n "$install_all" ]; then
all_package_names
else
comm -1 -2 $installed_list $avail_list

Return to:

Send suggestions and report system problems to the System administrator.