From fa97f045dc8a6613bd9bb179bf3bd58031f268bb Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Sun, 17 Jan 2021 13:47:21 -0800
Subject: [PATCH] Install pstree, 'make all-scripts' executable

---
 docker/admin/install.bash        |  1 +
 docker/packaging/install.bash    |  1 +
 docker/runtime/install.bash      |  1 +
 tools/write-all-build-scripts.js | 10 +++++-----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker/admin/install.bash b/docker/admin/install.bash
index e12e1cf..f3326d0 100755
--- a/docker/admin/install.bash
+++ b/docker/admin/install.bash
@@ -43,6 +43,7 @@ make
 man
 nodejs
 packer
+pstree
 skopeo
 ssh
 sudo
diff --git a/docker/packaging/install.bash b/docker/packaging/install.bash
index 1929f40..917c936 100755
--- a/docker/packaging/install.bash
+++ b/docker/packaging/install.bash
@@ -70,6 +70,7 @@ jq
 less
 man
 moreutils
+pstree
 ripgrep
 strace
 sudo
diff --git a/docker/runtime/install.bash b/docker/runtime/install.bash
index efa83bd..927979f 100755
--- a/docker/runtime/install.bash
+++ b/docker/runtime/install.bash
@@ -120,6 +120,7 @@ git
 jq
 make
 man
+pstree
 ripgrep
 strace
 sudo
diff --git a/tools/write-all-build-scripts.js b/tools/write-all-build-scripts.js
index 263c8bf..9ddafd0 100644
--- a/tools/write-all-build-scripts.js
+++ b/tools/write-all-build-scripts.js
@@ -3,6 +3,7 @@
 // hence having a single script that does the whole thing.
 
 import { promises as fs } from "fs";
+import nodePath from "path";
 import process from "process";
 import url from "url";
 
@@ -12,11 +13,10 @@ import { generateBuildScript } from "./generate-build-script.js";
 // Parse command-line arguments, run main functionality, and exit.
 async function main() {
   for (const { lang, type } of await getPackages()) {
-    await fs.mkdir(`build/${type}/${lang}`, { recursive: true });
-    await fs.writeFile(
-      `build/${type}/${lang}/build.bash`,
-      await generateBuildScript({ lang, type })
-    );
+    const scriptPath = `build/${type}/${lang}/build.bash`;
+    await fs.mkdir(nodePath.dirname(scriptPath), { recursive: true });
+    await fs.writeFile(scriptPath, await generateBuildScript({ lang, type }));
+    await fs.chmod(scriptPath, 0o755);
   }
   process.exit(0);
 }