acid.go

@@ -30,6 +30,7 @@ import (
 	"syscall"
 	ttemplate "text/template"
 	"time"
+	"unicode"
 
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/pkg/sftp"
@@ -153,14 +154,6 @@ var shellFuncs = ttemplate.FuncMap{
 
 // --- Utilities ---------------------------------------------------------------
 
-func localShell() string {
-	if shell := os.Getenv("SHELL"); shell != "" {
-		return shell
-	}
-	// The os/user package doesn't store the parsed out shell field.
-	return "/bin/sh"
-}
-
 func giteaSign(b []byte) string {
 	payloadHmac := hmac.New(sha256.New, []byte(getConfig().Secret))
 	payloadHmac.Write(b)
@@ -313,7 +306,9 @@ function get(id) {
 	return document.getElementById(id)
 }
 function getLog(id) {
-	const header = get(id), log = get(id + 'log'), text = log.textContent
+	const header = document.getElementById(id)
+	const log = document.getElementById(id + 'log')
+	const text = log.textContent
 	// lines[-1] is an implementation detail of terminalWriter.Serialize,
 	// lines[-2] is the actual last line.
 	const last = Math.max(0, text.split('\n').length - 2)
@@ -331,7 +326,8 @@ function refreshLog(log, top, changed) {
 	log.log.hidden = empty
 }
 let refresher = setInterval(() => {
-	const run = getLog('run'), task = getLog('task'), deploy = getLog('deploy')
+	let run = getLog('run'), task = getLog('task'), deploy = getLog('deploy')
+
     const url = new URL(window.location.href)
 	url.search = ''
 	url.searchParams.set('json', '')
@@ -370,8 +366,8 @@ let refresher = setInterval(() => {
 		if (!data.IsRunning)
 			clearInterval(refresher)
 	}).catch(error => {
-		clearInterval(refresher)
 		alert(error)
+		clearInterval(refresher)
 	})
 }, 1000 /* For faster updates than this, we should use WebSockets. */)
 </script>
@@ -846,7 +842,7 @@ func notifierRunCommand(ctx context.Context, task Task) {
 		return
 	}
 
-	cmd := exec.CommandContext(ctx, localShell())
+	cmd := exec.CommandContext(ctx, "sh")
 	cmd.Stdin = script
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -1170,6 +1166,14 @@ func executorDownload(client *ssh.Client, remoteRoot, localRoot string) error {
 	return nil
 }
 
+func executorLocalShell() string {
+	if shell := os.Getenv("SHELL"); shell != "" {
+		return shell
+	}
+	// The os/user package doesn't store the parsed out shell field.
+	return "/bin/sh"
+}
+
 func executorTmpDir(fallback string) string {
 	// See also: https://systemd.io/TEMPORARY_DIRECTORIES/
 	if tmp := os.Getenv("TMPDIR"); tmp != "" {
@@ -1205,10 +1209,9 @@ func executorDeploy(
 		return err
 	}
 
-	cmd := exec.CommandContext(ctx, localShell())
+	cmd := exec.CommandContext(ctx, executorLocalShell(), "-c", script.String())
 	cmd.Env = rt.localEnv()
 	cmd.Dir = dir
-	cmd.Stdin = script
 	cmd.Stdout = &rt.DeployLog
 	cmd.Stderr = &rt.DeployLog
 	return cmd.Run()
@@ -1602,15 +1605,18 @@ func (t *Task) CloneURL() string {
 }
 
 func shortDurationString(d time.Duration) string {
-	if d.Abs() >= 24*time.Hour {
-		return strconv.FormatInt(int64(d/time.Hour/24), 10) + "d"
-	} else if d.Abs() >= time.Hour {
-		return strconv.FormatInt(int64(d/time.Hour), 10) + "h"
-	} else if d.Abs() >= time.Minute {
-		return strconv.FormatInt(int64(d/time.Minute), 10) + "m"
-	} else {
-		return strconv.FormatInt(int64(d/time.Second), 10) + "s"
+	rs := []rune(d.Truncate(time.Second).String())
+	for i, r := range rs {
+		if !unicode.IsLetter(r) {
+			continue
+		}
+		i++
+		for i < len(rs) && unicode.IsLetter(rs[i]) {
+			i++
+		}
+		return string(rs[:i])
 	}
+	return string(rs)
 }
 
 func (t *Task) Created() *time.Time {

acid_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"testing"
 	ttemplate "text/template"
-	"time"
 )
 
 func TestTemplateQuote(t *testing.T) {
@@ -31,19 +30,3 @@ func TestTemplateQuote(t *testing.T) {
 		}
 	}
 }
-
-func TestShortDurationString(t *testing.T) {
-	for _, test := range []struct {
-		d      time.Duration
-		expect string
-	}{
-		{72 * time.Hour, "3d"},
-		{-3 * time.Hour, "-3h"},
-		{12 * time.Minute, "12m"},
-		{time.Millisecond, "0s"},
-	} {
-		if sd := shortDurationString(test.d); sd != test.expect {
-			t.Errorf("%s = %s; want %s\n", test.d, sd, test.expect)
-		}
-	}
-}