rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix instance updating

Browse source
This commit is contained in:
Tom 2023-08-01 09:56:48 +02:00
parent b2c12ac9be
commit 8bd44cd91e
9 changed files with 64 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/wisski/ingredient/barrel/composer/composer.go
View file

@ -7,6 +7,8 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient"
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/barrel"
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/barrel/drush"
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/mstore"
"github.com/tkw1536/pkglib/stream"
)
@ -15,13 +17,25 @@ type Composer struct {
ingredient.Base
Dependencies struct {
Barrel *barrel.Barrel
// PHP *php.PHP
MStore *mstore.MStore
Drush *drush.Drush
}
}
// Exec executes a composer command
// Exec executes a composer command for the main composer package.
// Returns an error iff composer does not exit with 0.
func (composer *Composer) Exec(ctx context.Context, progress io.Writer, command ...string) error {
if err := composer.Dependencies.Barrel.ShellScript(ctx, stream.NonInteractive(progress), append([]string{"composer", "--no-interaction", "--working-dir", barrel.ComposerDirectory}, command...)...); err != nil {
return composer.exec(ctx, progress, append([]string{"--working-dir", barrel.ComposerDirectory}, command...)...)
}
// Exec executes a composer command for the wisski directory.
// Returns an error iff composer does not exit with 0.
func (composer *Composer) ExecWissKI(ctx context.Context, progress io.Writer, command ...string) error {
return composer.exec(ctx, progress, append([]string{"--working-dir", barrel.WissKIDirectory}, command...)...)
}
func (composer *Composer) exec(ctx context.Context, progress io.Writer, command ...string) error {
if err := composer.Dependencies.Barrel.ShellScript(ctx, stream.NonInteractive(progress), append([]string{"composer", "--no-interaction"}, command...)...); err != nil {
return err
}
return nil
@ -37,7 +51,9 @@ func (composer *Composer) FixPermission(ctx context.Context, progress io.Writer)
// Install attempts runs 'composer require' with the given arguments
// Spec is like a specification on the command line.
func (composer *Composer) Install(ctx context.Context, progress io.Writer, args ...string) error {
composer.FixPermission(ctx, progress)
if err := composer.FixPermission(ctx, progress); err != nil {
return err
}
requires := append([]string{"require"}, args...)
if err := composer.Exec(ctx, progress, requires...); err != nil {