projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18870: Fix typo
[arvados.git]
/
cmd
/
arvados-package
/
fpm.go
diff --git
a/cmd/arvados-package/fpm.go
b/cmd/arvados-package/fpm.go
index ca63929e9839a8e3e01aa14108c9a1b10b3d4dfb..d81abab583cc78a3ddb5b0421ee38963d8187f83 100644
(file)
--- a/
cmd/arvados-package/fpm.go
+++ b/
cmd/arvados-package/fpm.go
@@
-64,12
+64,12
@@
func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
// Remove unneeded files. This is much faster than "fpm
// --exclude X" because fpm copies everything into a staging
// area before looking at the --exclude args.
// Remove unneeded files. This is much faster than "fpm
// --exclude X" because fpm copies everything into a staging
// area before looking at the --exclude args.
- cmd = exec.Command("bash", "-c", "cd /var/www/.gem/ruby && rm -rf */cache */bundler/gems/*/.git */bundler/gems/arvados-*/[^s]* */bundler/gems/arvados-*/s[^d]* */bundler/gems/arvados-*/sdk/[^cr]* */gems/passenger-*/src/cxx* ruby/*/gems/*/ext /var/lib/arvados/go")
+ cmd = exec.Command("bash", "-c", "cd /var/www/.gem/ruby && rm -rf */cache */bundler/gems/*/.git */bundler/gems/arvados-*/[^s]* */bundler/gems/arvados-*/s[^d]* */bundler/gems/arvados-*/sdk/[^cr]* */gems/passenger-*/src/cxx* ruby/*/gems/*/ext /var/lib/arvados/go
/var/lib/arvados/arvados-workbench2 /var/lib/arvados/node-*
")
cmd.Stdout = stdout
cmd.Stderr = stderr
err = cmd.Run()
if err != nil {
cmd.Stdout = stdout
cmd.Stderr = stderr
err = cmd.Run()
if err != nil {
- return fmt.Errorf("
rm -rf [...]: %w"
, err)
+ return fmt.Errorf("
%v: %w", cmd.Args
, err)
}
format := "deb" // TODO: rpm
}
format := "deb" // TODO: rpm
@@
-97,6
+97,10
@@
func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
"--verbose",
"--deb-use-file-permissions",
"--rpm-use-file-permissions",
"--verbose",
"--deb-use-file-permissions",
"--rpm-use-file-permissions",
+ "/etc/systemd/system/multi-user.target.wants/arvados.service",
+ "/lib/systemd/system/arvados.service",
+ "/usr/bin/arvados-client",
+ "/usr/bin/arvados-server",
"/var/lib/arvados",
"/var/www/.gem",
"/var/www/.passenger",
"/var/lib/arvados",
"/var/www/.gem",
"/var/www/.passenger",