aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--README28
-rw-r--r--conf/14.0-14.1.repl2
-rw-r--r--conf/14.1-14.2.repl2
-rw-r--r--slackupgrade (renamed from slackware-upgrade-system)15
-rw-r--r--slackupgrade.8 (renamed from slackware-upgrade-system.8)42
6 files changed, 53 insertions, 52 deletions
diff --git a/Makefile b/Makefile
index 3d90bb6..a741c2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Makefile for slackware-upgrade-system
+# Makefile for slackupgrade
# Copyright (C) 2019 Sergey Poznyakoff.
#
# Slackware-upgrade-system is free software; you can redistribute it and/or
@@ -12,11 +12,11 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with slackware-upgrade-system. If not, see
+# along with slackupgrade. If not, see
# <http://www.gnu.org/licenses/>.
PACKAGE = slackupgrade
-VERSION = 0.1
+VERSION = 0.2
SBINDIR = /sbin
MANDIR = /usr/man
@@ -33,7 +33,7 @@ help:;
@echo " MANDIR - toplevel directory for man page installation ($(MANDIR))"
@echo ""
@echo "$$ make install-sbin"
- @echo " Installs only the slackware-upgrade-system script."
+ @echo " Installs only the slackupgrade script."
@echo ""
@echo "$$ make install-man"
@echo " Installs only the manpage."
@@ -48,11 +48,11 @@ install: install-sbin install-conf install-man
install-sbin:
@if ! test -d $(DESTDIR)$(SBINDIR); then install -d $(DESTDIR)$(SBINDIR); fi
- install slackware-upgrade-system $(DESTDIR)$(SBINDIR)
+ install slackupgrade $(DESTDIR)$(SBINDIR)
install-man:
@if ! test -d $(DESTDIR)$(MAN8DIR); then install -d $(DESTDIR)$(MAN8DIR); fi
- install -m 644 slackware-upgrade-system.8 $(DESTDIR)$(MAN8DIR)
+ install -m 644 slackupgrade.8 $(DESTDIR)$(MAN8DIR)
install-conf:
@if ! test -d $(DESTDIR)$(CONFDIR); then install -d $(DESTDIR)$(CONFDIR); fi
@@ -64,8 +64,8 @@ install-conf:
DISTDIR = $(PACKAGE)-$(VERSION)
DISTFILES =\
- slackware-upgrade-system\
- slackware-upgrade-system.8\
+ slackupgrade\
+ slackupgrade.8\
Makefile\
COPYING\
README\
diff --git a/README b/README
index 243458d..fcd346c 100644
--- a/README
+++ b/README
@@ -1,18 +1,18 @@
Overview
========
-This package provides slackware-upgrade-system, a script that performs
-a full upgrade of a Slackware distribution.
+This package provides slackupgrade, a script that performs a full
+upgrade of a Slackware distribution.
Installation
============
-Run "make install" as root. The slackware-upgrade-system will be
-installed to /sbin, and its man page, slackware-upgrade-system.8, to
+Run "make install" as root. The slackupgrade script will be
+installed to /sbin, and its man page, slackupgrade.8, to
/usr/man/man8. These are most suitable locations for Slackware. To
install them elsewhere, use the following Makefile variables:
- SBINDIR - Directory to install slackware-upgrade-system to.
+ SBINDIR - Directory to install slackupgrade to.
MANDIR - toplevel directory for man page installation (/usr/man).
MAN8DIR - directory for the man page installation ($(MANDIR)/man8).
@@ -24,17 +24,17 @@ system. When upgrading a remote machine, it advisable to have a KVM
console attached to it, so that you can intervene if the box refuses
to boot.
-Please read slackware-upgrade-system(8) to familiarize yourself with
+Please read slackupgrade(8) to familiarize yourself with
the script and its options.
-Run slackware-upgrade-system in dry-run mode:
+Run slackupgrade in dry-run mode:
- slackware-upgrade-system -n
+ slackupgrade -n
This will look for the nearest next release available, create the list
of packages to be upgraded, installed and removed and will print the
results. This run will not touch any files on your filesystem
-(excepting the slackware-upgrade-system logs, see below). Instead it
+(excepting the slackupgrade logs, see below). Instead it
will verbosely print what would have been done during real upgrade.
Inspect its output to see if it actually does what you need. In
particular, the upgrade will most likely decide to remove some
@@ -50,12 +50,12 @@ man page for details).
To provide a replacement for a particular package, use the -p option.
For your information, the list of removed packages is left in file
-/var/log/slackware-upgrade-system-<P>-<N>.removed (see below).
+/var/log/slackupgrade-<P>-<N>.removed (see below).
When you are finished with the dry run, proceed to the actual upgrade.
Run
- slackware-upgrade-system
+ slackupgrade
with any additional options you decided to give it after the dry run.
After completion, the script will create three files for your
@@ -63,17 +63,17 @@ consideration. In the discussion below, <P> stands for the original
Slackware version number, and <N> stands for the new Slackware version
number (the version you upgraded to):
-/var/log/slackware-upgrade-system-<P>-<N>.log
+/var/log/slackupgrade-<P>-<N>.log
Log file. Contains detailed transcript of all actions performed
during the upgrade.
-/var/log/slackware-upgrade-system-<P>-<N>.removed
+/var/log/slackupgrade-<P>-<N>.removed
A list of packages removed during the upgrade. A package is removed
if the new release does not provide a replacement for it. This may
not always be desirable, and you may reinstall some of them
afterward.
-/var/log/slackware-upgrade-system-<P>-<N>.conffiles
+/var/log/slackupgrade-<P>-<N>.conffiles
A list of configuration file replacements created during the upgrade.
These are configuration files provided by the upgraded packages that
are left in the filesystem along with your current file versions.
diff --git a/conf/14.0-14.1.repl b/conf/14.0-14.1.repl
index af9130a..b65a330 100644
--- a/conf/14.0-14.1.repl
+++ b/conf/14.0-14.1.repl
@@ -1,5 +1,5 @@
# Package replacement map for upgrading from Slackware 14.0 to 14.1
-# See slackware-upgrade-system(8) for details.
+# See slackupgrade(8) for details.
Terminal xfce4-terminal
kdegames konquest ksquares ksnakeduel killbots kgoldrunner ksirk\
kiriki knavalbattle kdiamond kolf kbounce klickety kblocks\
diff --git a/conf/14.1-14.2.repl b/conf/14.1-14.2.repl
index 4594a97..94e60dd 100644
--- a/conf/14.1-14.2.repl
+++ b/conf/14.1-14.2.repl
@@ -1,5 +1,5 @@
# Package replacement map for upgrading from Slackware 14.1 to 14.2
-# See slackware-upgrade-system(8) for details.
+# See slackupgrade(8) for details.
procps procps-ng
udev eudev
portmap rpcbind
diff --git a/slackware-upgrade-system b/slackupgrade
index 4553b82..7296e18 100644
--- a/slackware-upgrade-system
+++ b/slackupgrade
@@ -1,5 +1,5 @@
#!/bin/bash
-# slackware-upgrade-system - full upgrade of a Slackware installation
+# slackupgrade - full upgrade of a Slackware installation
# Copyright (C) 2019 Sergey Poznyakoff.
#
# Slackware-upgrade-system is free software; you can redistribute it and/or
@@ -13,13 +13,13 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with slackware-upgrade-system. If not, see
+# along with slackupgrade. If not, see
# <http://www.gnu.org/licenses/>.
set -e
# Configuration directory
-: ${SUS_CONFDIR:=/etc/slackware-upgrade-system}
+: ${SLACKUPGRADE_CONFDIR:=/etc/slackupgrade}
# Slackware root directory
rooturl=
# Log file name
@@ -381,7 +381,7 @@ tail +13 $checksums | \
tee $avail_index | awk '{print $1}' | sort > $avail_list
# Initialize log file name
-logstem=/var/log/slackware-upgrade-system-$VERSION-$newversion
+logstem=/var/log/slackupgrade-$VERSION-$newversion
logfile=$logstem.log
remove_report=$logstem.removed
@@ -430,13 +430,14 @@ else
fi
# Create $remove_report and the list of installation candidates.
-if [ -f "$SUS_CONFDIR/$VERSION-$newversion.repl" ]; then
- error "info: reading $SUS_CONFDIR/$VERSION-$newversion.repl"
+if [ -f "$SLACKUPGRADE_CONFDIR/$VERSION-$newversion.repl" ]; then
+ error "info: reading $SLACKUPGRADE_CONFDIR/$VERSION-$newversion.repl"
# Update candidates and save the replacement map in a temporary.
awk '{ sub(/#.*$/,""); sub(/[[:space:]]+$/,"") }
/\\$/ { sub(/\\$/,""); p = p $0; next }
NF == 0 { if (p) print p; p = ""; next }
- { print p $0; p="" }' $SUS_CONFDIR/$VERSION-$newversion.repl | \
+ { print p $0; p="" }' \
+ $SLACKUPGRADE_CONFDIR/$VERSION-$newversion.repl | \
sort +0 -1 | \
tee rename.$$ | \
join - remove.list | \
diff --git a/slackware-upgrade-system.8 b/slackupgrade.8
index 9facf56..b962db5 100644
--- a/slackware-upgrade-system.8
+++ b/slackupgrade.8
@@ -1,4 +1,4 @@
-.\" This file is part of slackware-upgrade-system
+.\" This file is part of slackupgrade
.\" Copyright (C) 2019 Sergey Poznyakoff.
.\"
.\" Slackware-upgrade-system is free software; you can redistribute it and/or
@@ -12,18 +12,18 @@
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
-.\" along with slackware-upgrade-system. If not, see
+.\" along with slackupgrade. If not, see
.\" <http://www.gnu.org/licenses/>.
-.TH SLACKWARE\-UPGRADE\-SYSTEM 8 "September 20, 2019" "SLACKWARE\-UPGRADE\-SYSTEM" "System Manager's Manual"
+.TH SLACKUPGRADE 8 "September 23, 2019" "SLACKUPGRADE" "System Manager's Manual"
.SH NAME
-slackware\-upgrade\-system \- do a full upgrade of a Slackware installation
+slackwupgrade \- do a full upgrade of a Slackware installation
.SH SYNOPSIS
.nh
.na
-\fBslackware\-upgrade\-system\fR\
+\fBslackupgrade\fR\
[\fB\-anqvy\fR]\
[\fB\-k \fIFILE\fR]\
- [\fB\-p \fIPACKAGE\fR\]
+ [\fB\-p \fIPACKAGE\fR\]\
[\fB\-s \fISERIES\fR]\
[\fIURL\fR]
.ad
@@ -76,7 +76,7 @@ system, therefore they will be removed after a successful upgrade.
Before proceeding, the program will display this list on the screen
and save it in file
.nh
-\fB/var/log/slackware-upgrade-system-\fIOLD\fR-\fINEW\fB.removed\fR
+\fB/var/log/slackupgrade-\fIOLD\fR-\fINEW\fB.removed\fR
.hy
for your consideration (here, \fIOLD\fR and \fINEW\fR stand for the
current and new Slackware version numbers, correspondingly). After
@@ -97,7 +97,7 @@ use the \fB\-k \fIFILE\fR\fR option to instruct it to use this file.
Secondly, if you are upgrading to the version for which there is no
replacement map, there can be replacement packages for some of the
orphaned ones. You can create a replacement map and save it to
-the \fB/etc/slackware\-upgrade\-system\fR directory (see the section
+the \fB/etc/slackupgrade\fR directory (see the section
\fBREPLACEMENT MAP\fR for details). If you do, please drop me a note
so that your changes become available for other users (see the
\fBBUGS\fR section, for contact information). You can also use the
@@ -110,7 +110,7 @@ series from the distribution with the \fB\-s\fR option. E.g., it is
often a good idea to install all packages from series \fBl\fR, like that:
.PP
.EX
-slackware-upgrade-system \-s l
+slackupgrade \-s l
.EE
.PP
Otherwise, you can request to install all missing packages from all
@@ -120,7 +120,7 @@ series, excepting \fBkde*\fR, by running the command with the
At the end of the run, the program prints additional instructions and
leaves the detailed log in file
.nh
-\fB/var/log/slackware\-upgrade\-system\-\fIOLD\fB\-\fINEW\fB.log\fR.
+\fB/var/log/slackupgrade-\fIOLD\fB\-\fINEW\fB.log\fR.
.hy
.sp
Here, \fIOLD\fR and \fINEW\fR stand for the old and new Slackware
@@ -130,7 +130,7 @@ If any configuration files were created during the upgrade that
conflict with the existing files, they will be stored alongside the
original files, with the \fB.new\fR extension. The list of these
files will be stored in file
-\fB/var/log/slackware\-upgrade\-system\-\fIOLD\fB\-\fINEW\fB.conffiles\fR.
+\fB/var/log/slackupgrade\-\fIOLD\fB\-\fINEW\fB.conffiles\fR.
.SH OPTIONS
.TP
.B \-a
@@ -140,7 +140,7 @@ Install all series except \fBkde*\fR.
Display a short help summary and exit.
.TP
\fB\-k \fIFILE\fR
-After successful upgrade, \fBslackware\-upgrade\-system will remove
+After successful upgrade, \fBslackupgrade\fR will remove
previously installed packages that are not available in the new
distribution. This option allows you to supply a list of packages
that should not be removed. Each line in \fIFILE\fR should list
@@ -151,7 +151,7 @@ To obtain initial list of packages that will be removed, run the
program with the \fB\-n\fR option. At the end of the run, the list
will be stored in file
.nh
-\fB/var/log/slackware-upgrade-system-\fIOLD\fR-\fINEW\fB.removed\fR.
+\fB/var/log/slackupgrade-\fIOLD\fR-\fINEW\fB.removed\fR.
.hy
At a pinch (not really recommended), you can move it elsewhere and use
as argument to that option. This way all packages will be preserved.
@@ -174,7 +174,7 @@ Slackware system, like that:
.sp
.nh
.na
-slackware-upgrade-system -a -s kde -s kdei
+slackupgrade -a -s kde -s kdei
.ad
.hy
.TP
@@ -186,13 +186,13 @@ Assume "yes" to all queries.
.SH REPLACEMENT MAP
Replacement map files contain names of packages that have been
replaced with another packages in the new release. They are stored in
-the \fB/etc/slackware\-upgrade\-system\fR directory. Each replacement
+the \fB/etc/slackupgrade\fR directory. Each replacement
map is named \fIOLD\fB\-\fINEW\fB.repl\fR, where \fIOLD\fR and
\fINEW\fR are two subsequent versions of Slackware. For example, the
-file \fB/etc/slackware\-upgrade\-system/14.1\-14.2.repl\fR contains
+file \fB/etc/slackupgrade/14.1\-14.2.repl\fR contains
changes in package names between versions 14.1 and 14.2.
.PP
-This version of \fBslackware\-upgrade\-system\fR is shipped with two
+This version of \fBslackupgrade\fR is shipped with two
replacement maps, for upgrades between 14.0 and 14.1, and between 14.1
and 14.2.
.PP
@@ -213,20 +213,20 @@ Comments are introduced with the hash sign (\fB#\fR) and extend to the
nearest newline character. Empty lines and comments are ignored.
.SH FILES
.TP
-\fB/etc/slackware\-upgrade\-system/\fIOLD\fB\-\fINEW\fB.repl\fR
+\fB/etc/slackupgrade/\fIOLD\fB\-\fINEW\fB.repl\fR
Replacement map for upgrades from version \fIOLD\fR to \fINEW\fR.
.TP
-\fB/var/log/slackware\-upgrade\-system\-\fIOLD\fB\-\fINEW\fB.log\fR
+\fB/var/log/slackupgrade\-\fIOLD\fB\-\fINEW\fB.log\fR
Detailed log of operations performed during the upgrade from version
\fIOLD\fR to \fINEW\fR.
.TP
-\fB/var/log/slackware\-upgrade\-system\-\fIOLD\fB\-\fINEW\fB.conffiles\fR
+\fB/var/log/slackupgrade\-\fIOLD\fB\-\fINEW\fB.conffiles\fR
List of the new incoming config files on your system with the
\fB.new\fR extension. You may need to merge them with your actual
files, or move them over, or simply remove them. In any case, it is
good idea to carefully consider each of them.
.TP
-\fB/var/log/slackware-upgrade-system-\fIOLD\fR-\fINEW\fB.removed\fR
+\fB/var/log/slackupgrade-\fIOLD\fR-\fINEW\fB.removed\fR
The list of packages that were removed from the system. Examine it.
You may need to re-install some or all of them from third-party
servers or from slackbuilds.

Return to:

Send suggestions and report system problems to the System administrator.