Merge branch 'cursor/makepkg-cwd-65da' into 'master'
fix: laat makepkg in de update-werkmap draaien See merge request Timfa/bluegit!45
@@ -184,6 +184,46 @@ func TestUpdateScriptBehavior(t *testing.T) {
184
184
}
185
185
}
186
186
187
func TestMakepkgRunsBesidePkgbuild(t *testing.T) {
188
if _, err := exec.LookPath("bash"); err != nil {
189
t.Skip("bash ontbreekt")
190
}
191
script := filepath.Join(root(t), "packaging", "bluegit-update.sh")
192
abs, err := filepath.Abs(script)
193
if err != nil {
194
t.Fatal(err)
195
}
196
script = abs
197
work := t.TempDir()
198
if err := os.WriteFile(filepath.Join(work, "PKGBUILD"), []byte("pkgname=bluegit\n"), 0o644); err != nil {
199
t.Fatal(err)
200
}
201
bin := t.TempDir()
202
record := filepath.Join(t.TempDir(), "pwd")
203
runuser := "#!/bin/bash\nset -euo pipefail\nwhile [[ $# -gt 0 && \"$1\" != \"--\" ]]; do shift; done\n[[ $# -gt 0 ]] || exit 1\nshift\nexec \"$@\"\n"
204
makepkg := "#!/bin/bash\nset -euo pipefail\npwd > " + shellQuote(record) + "\n[[ -f PKGBUILD ]]\n"
205
if err := os.WriteFile(filepath.Join(bin, "runuser"), []byte(runuser), 0o755); err != nil {
206
t.Fatal(err)
207
}
208
if err := os.WriteFile(filepath.Join(bin, "makepkg"), []byte(makepkg), 0o755); err != nil {
209
t.Fatal(err)
210
}
211
probe := "source " + shellQuote(script) + "\nbuild_package " + shellQuote(work) + "\n"
212
cmd := exec.Command("bash", "-c", probe)
213
cmd.Dir = t.TempDir()
214
cmd.Env = append(os.Environ(), "PATH="+bin+string(os.PathListSeparator)+os.Getenv("PATH"))
215
if out, err := cmd.CombinedOutput(); err != nil {
216
t.Fatalf("makepkg: %v %s", err, out)
217
}
218
raw, err := os.ReadFile(record)
219
if err != nil {
220
t.Fatal(err)
221
}
222
if strings.TrimSpace(string(raw)) != work {
223
t.Fatalf("makepkg draaide in %q, PKGBUILD staat in %q", strings.TrimSpace(string(raw)), work)
224
}
225
}
226
187
227
func shellQuote(s string) string {
188
228
return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"
189
229
}
@@ -184,6 +184,46 @@ func TestUpdateScriptBehavior(t *testing.T) {184
}184
}185
}185
}186
186
187
func TestMakepkgRunsBesidePkgbuild(t *testing.T) {188
if _, err := exec.LookPath("bash"); err != nil {189
t.Skip("bash ontbreekt")190
}191
script := filepath.Join(root(t), "packaging", "bluegit-update.sh")192
abs, err := filepath.Abs(script)193
if err != nil {194
t.Fatal(err)195
}196
script = abs197
work := t.TempDir()198
if err := os.WriteFile(filepath.Join(work, "PKGBUILD"), []byte("pkgname=bluegit\n"), 0o644); err != nil {199
t.Fatal(err)200
}201
bin := t.TempDir()202
record := filepath.Join(t.TempDir(), "pwd")203
runuser := "#!/bin/bash\nset -euo pipefail\nwhile [[ $# -gt 0 && \"$1\" != \"--\" ]]; do shift; done\n[[ $# -gt 0 ]] || exit 1\nshift\nexec \"$@\"\n"204
makepkg := "#!/bin/bash\nset -euo pipefail\npwd > " + shellQuote(record) + "\n[[ -f PKGBUILD ]]\n"205
if err := os.WriteFile(filepath.Join(bin, "runuser"), []byte(runuser), 0o755); err != nil {206
t.Fatal(err)207
}208
if err := os.WriteFile(filepath.Join(bin, "makepkg"), []byte(makepkg), 0o755); err != nil {209
t.Fatal(err)210
}211
probe := "source " + shellQuote(script) + "\nbuild_package " + shellQuote(work) + "\n"212
cmd := exec.Command("bash", "-c", probe)213
cmd.Dir = t.TempDir()214
cmd.Env = append(os.Environ(), "PATH="+bin+string(os.PathListSeparator)+os.Getenv("PATH"))215
if out, err := cmd.CombinedOutput(); err != nil {216
t.Fatalf("makepkg: %v %s", err, out)217
}218
raw, err := os.ReadFile(record)219
if err != nil {220
t.Fatal(err)221
}222
if strings.TrimSpace(string(raw)) != work {223
t.Fatalf("makepkg draaide in %q, PKGBUILD staat in %q", strings.TrimSpace(string(raw)), work)224
}225
}226
187
func shellQuote(s string) string {227
func shellQuote(s string) string {188
return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"228
return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"189
}229
}@@ -105,6 +105,19 @@ prepare_build() {
105
105
printf '%s\n' "$version"
106
106
}
107
107
108
# runuser houdt de cwd van de unit. Die is /, dus makepkg meldt
109
# "PKGBUILD does not exist" tenzij we eerst naar de werkmap gaan.
110
build_package() {
111
local work="$1"
112
cd "$work"
113
runuser -u "$BLUEGIT_BUILD_USER" -- env \
114
HOME="/var/lib/${BLUEGIT_BUILD_USER}" \
115
BUILDDIR="$work/build" \
116
SRCDEST="$work" \
117
PKGDEST="$work/pkg" \
118
makepkg --noconfirm --nosign
119
}
120
108
121
main() {
109
122
local ref repo work version built
110
123
: "${BLUEGIT_UPDATE_TOKEN:?BLUEGIT_UPDATE_TOKEN ontbreekt}"
@@ -147,12 +160,7 @@ main() {
147
160
echo "pkgver $version"
148
161
mkdir -p "$work/pkg"
149
162
chown -R "$BLUEGIT_BUILD_USER:$BLUEGIT_BUILD_USER" "$work"
150
runuser -u "$BLUEGIT_BUILD_USER" -- env \
151
HOME="/var/lib/${BLUEGIT_BUILD_USER}" \
152
BUILDDIR="$work/build" \
153
SRCDEST="$work" \
154
PKGDEST="$work/pkg" \
155
makepkg --noconfirm --nosign
163
build_package "$work"
156
164
chown -R root:root "$work/pkg"
157
165
158
166
if ! wait_until_idle; then
@@ -105,6 +105,19 @@ prepare_build() {105
printf '%s\n' "$version"105
printf '%s\n' "$version"106
}106
}107
107
108
# runuser houdt de cwd van de unit. Die is /, dus makepkg meldt109
# "PKGBUILD does not exist" tenzij we eerst naar de werkmap gaan.110
build_package() {111
local work="$1"112
cd "$work"113
runuser -u "$BLUEGIT_BUILD_USER" -- env \114
HOME="/var/lib/${BLUEGIT_BUILD_USER}" \115
BUILDDIR="$work/build" \116
SRCDEST="$work" \117
PKGDEST="$work/pkg" \118
makepkg --noconfirm --nosign119
}120
108
main() {121
main() {109
local ref repo work version built122
local ref repo work version built110
: "${BLUEGIT_UPDATE_TOKEN:?BLUEGIT_UPDATE_TOKEN ontbreekt}"123
: "${BLUEGIT_UPDATE_TOKEN:?BLUEGIT_UPDATE_TOKEN ontbreekt}"@@ -147,12 +160,7 @@ main() {147
echo "pkgver $version"160
echo "pkgver $version"148
mkdir -p "$work/pkg"161
mkdir -p "$work/pkg"149
chown -R "$BLUEGIT_BUILD_USER:$BLUEGIT_BUILD_USER" "$work"162
chown -R "$BLUEGIT_BUILD_USER:$BLUEGIT_BUILD_USER" "$work"150
runuser -u "$BLUEGIT_BUILD_USER" -- env \163
build_package "$work"151
HOME="/var/lib/${BLUEGIT_BUILD_USER}" \152
BUILDDIR="$work/build" \153
SRCDEST="$work" \154
PKGDEST="$work/pkg" \155
makepkg --noconfirm --nosign156
chown -R root:root "$work/pkg"164
chown -R root:root "$work/pkg"157
165
158
if ! wait_until_idle; then166
if ! wait_until_idle; then