aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-02-15 20:19:08 +0200
committerSergey Poznyakoff <gray@gnu.org>2020-02-15 20:19:08 +0200
commit19de5926253c0b5a060997dbc0f33711336adfeb (patch)
treee4b6093243351c5d3f3bfe3ef3af96fa70839385
parent0a5f8ec4230566295e3f5b82e6083fd5b9bb2dea (diff)
downloadslackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.gz
slackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.bz2
Fix installation directory for configuration files
-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
@@ -12,25 +12,25 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with slackupgrade. If not, see
# <http://www.gnu.org/licenses/>.
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"
@echo " Installs the program. Influential variables:"
@echo " SBINDIR - directory to install system binaries to ($(SBINDIR))"
@echo " MANDIR - toplevel directory for man page installation ($(MANDIR))"
@echo ""
@echo "$$ make install-sbin"
@echo " Installs only the slackupgrade script."
diff --git a/slackupgrade b/slackupgrade
index 30bfa9c..e4335a0 100644
--- a/slackupgrade
+++ b/slackupgrade
@@ -567,25 +567,25 @@ do
abend "no files in series $series"
fi
file=$(getfile $n)
if [ -z "$file" ]; then
abend "exiting"
fi
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
fi
for s in $install_series
do
series_package_names $s
done
if [ -n "$install_packages" ]; then

Return to:

Send suggestions and report system problems to the System administrator.