1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.4 2021/05/26 09:21:39 he Exp $
No logging to 'install.log'.
Do not create 'uninstall.sh'.
Rewrite to not use a whole lot of subprocesses just for doing
pattern matching and substitution in the install phase using "grep"
and "sed" when shell builtin "case" and "omit shortest match" ops
should do just fine.
--- src/tools/rust-installer/install-template.sh.orig 2021-03-23 16:15:29.000000000 +0000
+++ src/tools/rust-installer/install-template.sh
@@ -15,20 +15,12 @@ set -u
init_logging() {
local _abs_libdir="$1"
local _logfile="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/install.log"
- rm -f "$_logfile"
- need_ok "failed to remove old installation log"
- touch "$_logfile"
- need_ok "failed to create installation log"
LOGFILE="$_logfile"
}
log_line() {
local _line="$1"
- if [ -n "${LOGFILE-}" -a -e "${LOGFILE-}" ]; then
- echo "$_line" >> "$LOGFILE"
- # Ignore errors, which may happen e.g. after the manifest dir is deleted
- fi
}
msg() {
@@ -442,8 +434,8 @@ uninstall_components() {
local _directive
while read _directive; do
- local _command=`echo $_directive | cut -f1 -d:`
- local _file=`echo $_directive | cut -f2 -d:`
+ local _command=${_directive%%:*}
+ local _file=${_directive#*:}
# Sanity checks
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
@@ -549,8 +541,8 @@ install_components() {
local _directive
while read _directive; do
- local _command=`echo $_directive | cut -f1 -d:`
- local _file=`echo $_directive | cut -f2 -d:`
+ local _command=${_directive%%:*}
+ local _file=${_directive#*:}
# Sanity checks
if [ ! -n "$_command" ]; then critical_err "malformed installation directive"; fi
@@ -559,54 +551,45 @@ install_components() {
# Decide the destination of the file
local _file_install_path="$_dest_prefix/$_file"
- if echo "$_file" | grep "^etc/" > /dev/null
- then
- local _f="$(echo "$_file" | sed 's/^etc\///')"
- _file_install_path="$CFG_SYSCONFDIR/$_f"
- fi
-
- if echo "$_file" | grep "^bin/" > /dev/null
- then
- local _f="$(echo "$_file" | sed 's/^bin\///')"
- _file_install_path="$CFG_BINDIR/$_f"
- fi
-
- if echo "$_file" | grep "^lib/" > /dev/null
- then
- local _f="$(echo "$_file" | sed 's/^lib\///')"
- _file_install_path="$CFG_LIBDIR/$_f"
- fi
-
- if echo "$_file" | grep "^share" > /dev/null
- then
- local _f="$(echo "$_file" | sed 's/^share\///')"
- _file_install_path="$CFG_DATADIR/$_f"
- fi
-
- if echo "$_file" | grep "^share/man/" > /dev/null
- then
- local _f="$(echo "$_file" | sed 's/^share\/man\///')"
- _file_install_path="$CFG_MANDIR/$_f"
- fi
+ case "$_file" in
+ etc/*)
+ local _f=${_file#"etc/"}
+ _file_install_path="$CFG_SYSCONFDIR/$_f"
+ ;;
+ bin/*)
+ local _f=${_file#"bin/"}
+ _file_install_path="$CFG_BINDIR/$_f"
+ ;;
+ lib/*)
+ local _f=${_file#"lib/"}
+ _file_install_path="$CFG_LIBDIR/$_f"
+ ;;
+ share/man/*)
+ local _f=${_file#"share/man/"}
+ _file_install_path="$CFG_MANDIR/$_f"
+ ;;
+ share/doc/*)
+ # HACK: Try to support overriding --docdir. Paths with the form
+ # "share/doc/$product/" can be redirected to a single --docdir
+ # path. If the following detects that --docdir has been specified
+ # then it will replace everything preceeding the "$product" path
+ # component. The problem here is that the combined rust installer
+ # contains two "products": rust and cargo; so the contents of those
+ # directories will both be dumped into the same directory; and the
+ # contents of those directories are _not_ disjoint. Since this feature
+ # is almost entirely to support 'make install' anyway I don't expect
+ # this problem to be a big deal in practice.
+ if [ "$CFG_DOCDIR" != "<default>" ]; then
+ local _f=${_file#"share/doc/"}
+ _file_install_path="$CFG_DOCDIR/$_f"
+ fi
+ ;;
+ share/*)
+ local _f=${_file#"share/"}
+ _file_install_path="$CFG_DATADIR/$_f"
+ ;;
+ esac
- # HACK: Try to support overriding --docdir. Paths with the form
- # "share/doc/$product/" can be redirected to a single --docdir
- # path. If the following detects that --docdir has been specified
- # then it will replace everything preceeding the "$product" path
- # component. The problem here is that the combined rust installer
- # contains two "products": rust and cargo; so the contents of those
- # directories will both be dumped into the same directory; and the
- # contents of those directories are _not_ disjoint. Since this feature
- # is almost entirely to support 'make install' anyway I don't expect
- # this problem to be a big deal in practice.
- if [ "$CFG_DOCDIR" != "<default>" ]
- then
- if echo "$_file" | grep "^share/doc/" > /dev/null
- then
- local _f="$(echo "$_file" | sed 's/^share\/doc\/[^/]*\///')"
- _file_install_path="$CFG_DOCDIR/$_f"
- fi
- fi
# Make sure there's a directory for it
make_dir_recursive "$(dirname "$_file_install_path")"
@@ -625,14 +608,16 @@ install_components() {
maybe_backup_path "$_file_install_path"
- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
- then
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
- run chmod 755 "$_file_install_path"
- else
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
- run chmod 644 "$_file_install_path"
+ local mode=644
+ if test -x "$_src_dir/$_component/$_file"; then
+ mode=755
fi
+ case "$_file" in
+ bin/*) mode=755
+ ;;
+ esac
+ run cp "$_src_dir/$_component/$_file" "$_file_install_path"
+ run chmod $mode "$_file_install_path"
critical_need_ok "file creation failed"
# Update the manifest
@@ -972,7 +957,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
critical_need_ok "failed to write installer version"
# Install the uninstaller
-install_uninstaller "$src_dir" "$src_basename" "$abs_libdir"
# Install each component
install_components "$src_dir" "$abs_libdir" "$dest_prefix" "$components"
|
