Skip to content

Commit 197f3a1

Browse files
committed
switch to sh for execing gradlew
1 parent b0011c2 commit 197f3a1

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

saturn/pkg/run/java.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,11 @@ func (s *JavaScaffold) Prepare() *Step {
6161
return fmt.Errorf("os.RemoveAll: %v", err)
6262
}
6363

64-
// Make gradlew executable
65-
_, err := s.Scaffold.RunCommand(ctx, []string{}, "chmod", "+x", "./gradlew")
66-
if err != nil {
67-
return fmt.Errorf("chmod gradlew: %v", err)
68-
}
69-
7064
log.Ctx(ctx).Debug().Msg("Updating distribution.")
7165
out, err := s.Scaffold.RunCommand(
7266
ctx,
7367
s.javaEnv,
68+
"sh",
7469
"./gradlew",
7570
"update",
7671
fmt.Sprintf("-PonSaturn=%t", s.onSaturn),
@@ -151,6 +146,7 @@ func (s *JavaScaffold) VerifySubmission() *Step {
151146
out, err := s.Scaffold.RunIsolatedCommand(
152147
ctx,
153148
s.javaEnv,
149+
"sh",
154150
"./gradlew",
155151
"verify",
156152
fmt.Sprintf("-Pteam=%s", pkg),
@@ -187,6 +183,7 @@ func (s *JavaScaffold) RunMatch() *Step {
187183
out, err := s.Scaffold.RunIsolatedCommand(
188184
ctx,
189185
s.javaEnv,
186+
"sh",
190187
"./gradlew",
191188
"run",
192189
fmt.Sprintf("-PonSaturn=%t", s.onSaturn),

0 commit comments

Comments
 (0)