diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-02-15 20:19:08 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-02-15 20:19:08 +0200 |
commit | 19de5926253c0b5a060997dbc0f33711336adfeb (patch) | |
tree | e4b6093243351c5d3f3bfe3ef3af96fa70839385 | |
parent | 0a5f8ec4230566295e3f5b82e6083fd5b9bb2dea (diff) | |
download | slackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.gz slackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.bz2 |
Fix installation directory for configuration files
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | slackupgrade | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -12,25 +12,25 @@ | |||
12 | # GNU General Public License for more details. | 12 | # GNU General Public License for more details. |
13 | # | 13 | # |
14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
15 | # along with slackupgrade. If not, see | 15 | # along with slackupgrade. If not, see |
16 | # <http://www.gnu.org/licenses/>. | 16 | # <http://www.gnu.org/licenses/>. |
17 | 17 | ||
18 | PACKAGE = slackupgrade | 18 | PACKAGE = slackupgrade |
19 | VERSION = 1.0 | 19 | VERSION = 1.0 |
20 | 20 | ||
21 | SBINDIR = /sbin | 21 | SBINDIR = /sbin |
22 | MANDIR = /usr/man | 22 | MANDIR = /usr/man |
23 | MAN8DIR = $(MANDIR)/man8 | 23 | MAN8DIR = $(MANDIR)/man8 |
24 | CONFDIR = /etc/slackware-system-upgrade | 24 | CONFDIR = /etc/$(PACKAGE) |
25 | CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl | 25 | CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl |
26 | 26 | ||
27 | help:; | 27 | help:; |
28 | @echo "Avalable targets:" | 28 | @echo "Avalable targets:" |
29 | @echo "" | 29 | @echo "" |
30 | @echo "$$ make install" | 30 | @echo "$$ make install" |
31 | @echo " Installs the program. Influential variables:" | 31 | @echo " Installs the program. Influential variables:" |
32 | @echo " SBINDIR - directory to install system binaries to ($(SBINDIR))" | 32 | @echo " SBINDIR - directory to install system binaries to ($(SBINDIR))" |
33 | @echo " MANDIR - toplevel directory for man page installation ($(MANDIR))" | 33 | @echo " MANDIR - toplevel directory for man page installation ($(MANDIR))" |
34 | @echo "" | 34 | @echo "" |
35 | @echo "$$ make install-sbin" | 35 | @echo "$$ make install-sbin" |
36 | @echo " Installs only the slackupgrade script." | 36 | @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 | |||
567 | abend "no files in series $series" | 567 | abend "no files in series $series" |
568 | fi | 568 | fi |
569 | file=$(getfile $n) | 569 | file=$(getfile $n) |
570 | if [ -z "$file" ]; then | 570 | if [ -z "$file" ]; then |
571 | abend "exiting" | 571 | abend "exiting" |
572 | fi | 572 | fi |
573 | dropfile $file | 573 | dropfile $file |
574 | done | 574 | done |
575 | 575 | ||
576 | # Build a list of installed packages | 576 | # Build a list of installed packages |
577 | ls /var/log/packages |\ | 577 | ls /var/log/packages |\ |
578 | sed -r -e 's/-[^-]+-(i386|x86(_64)?|arm|noarch|fw)-[[:digit:]]+(_.*)?//' |\ | 578 | sed -r -e 's/-[^-]+-(i386|x86(_64)?|arm|noarch|fw)-[[:digit:]]+(_.*)?//' |\ |
579 | sort > $installed_list | 579 | sort -u > $installed_list |
580 | 580 | ||
581 | # Build a list of packages to install | 581 | # Build a list of packages to install |
582 | (if [ -n "$install_all" ]; then | 582 | (if [ -n "$install_all" ]; then |
583 | all_package_names | 583 | all_package_names |
584 | else | 584 | else |
585 | comm -1 -2 $installed_list $avail_list | 585 | comm -1 -2 $installed_list $avail_list |
586 | fi | 586 | fi |
587 | for s in $install_series | 587 | for s in $install_series |
588 | do | 588 | do |
589 | series_package_names $s | 589 | series_package_names $s |
590 | done | 590 | done |
591 | if [ -n "$install_packages" ]; then | 591 | if [ -n "$install_packages" ]; then |