From 7bb2582c6df59eb4295485b2b5f6ceb8ed5b78ea Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Sun, 4 Jul 2021 03:08:34 +0000
Subject: [PATCH] Misc language fixes

---
 langs/qsharp.yaml              | 13 ++++++++-----
 langs/reasonml.yaml            |  4 +---
 langs/red.yaml                 |  2 +-
 tools/generate-build-script.js |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/langs/qsharp.yaml b/langs/qsharp.yaml
index 14c6224..98f7a42 100644
--- a/langs/qsharp.yaml
+++ b/langs/qsharp.yaml
@@ -23,16 +23,18 @@ install:
   #
   # We could optimize further but I don't feel like it right now.
   manual: |
-    install -d "${pkg}/opt/qsharp/skel"
+    install -d "${pkg}/opt/qsharp/skel-home"
+    install -d "${pkg}/opt/qsharp/skel-src"
 
     dotnet new -i Microsoft.Quantum.ProjectTemplates
     dotnet new console -lang Q# -o main
     dotnet run --project main
 
     shopt -s dotglob
-    cp -R * "${HOME}/.dotnet" "${HOME}/.nuget" "${pkg}/opt/qsharp/skel/"
-    rm "${pkg}/opt/qsharp/skel/main/Program.qs"
-    chmod -R a=u,go-w "${pkg}/opt/qsharp/skel"
+    cp -R main "${pkg}/opt/qsharp/skel-src/"
+    cp -R "${HOME}/.dotnet" "${HOME}/.nuget" "${pkg}/opt/qsharp/skel-home/"
+    rm "${pkg}/opt/qsharp/skel-src/main/Program.qs"
+    chmod -R a=u,go-w "${pkg}/opt/qsharp"
   manualInstall: |
     wget "https://packages.microsoft.com/config/ubuntu/${ubuntu_ver}/packages-microsoft-prod.deb"
     sudo --preserve-env=DEBIAN_FRONTEND apt-get update
@@ -40,7 +42,8 @@ install:
 
 setup: |
   shopt -s dotglob
-  cp -R /opt/qsharp/skel/* ./
+  cp -R /opt/qsharp/skel-src/* ./
+  cp -R /opt/qsharp/skel-home/* "${HOME}/"
 
 main: "main/Main.qs"
 template: |
diff --git a/langs/reasonml.yaml b/langs/reasonml.yaml
index 12662e9..7b2776d 100644
--- a/langs/reasonml.yaml
+++ b/langs/reasonml.yaml
@@ -9,8 +9,6 @@ name: "ReasonML"
 
 install:
   prepare:
-    apt:
-      - yarn
     npm:
       - bs-platform
   npm:
@@ -31,7 +29,7 @@ install:
     pushd "${pkg}/opt/reasonml/skel"
     bsb -init .
     cat bsconfig.json | jq '.name = "riju-project"' | sponge bsconfig.json
-    yarn install
+    npm install
     popd
 
 main: "main.re"
diff --git a/langs/red.yaml b/langs/red.yaml
index 86f82a0..8c69509 100644
--- a/langs/red.yaml
+++ b/langs/red.yaml
@@ -17,7 +17,7 @@ install:
     cp -R "$HOME/.red" "${pkg}/opt/red/skel/"
 
 setup: |
-  shopt -s dotglob; cp -R /opt/red/skel/* ./
+  shopt -s dotglob; cp -R /opt/red/skel/* "${HOME}/"
 
 # https://github.com/red/red/issues/543#issuecomment-25404212
 repl: |
diff --git a/tools/generate-build-script.js b/tools/generate-build-script.js
index d594090..cd547ad 100644
--- a/tools/generate-build-script.js
+++ b/tools/generate-build-script.js
@@ -419,7 +419,7 @@ EOF`);
     parts.unshift(`ubuntu_name="$(lsb_release -cs)"`);
   }
   if (parts.join("\n\n").includes("ubuntu_ver")) {
-    parts.unshift(`ubuntu_name="$(lsb_release -rs)"`);
+    parts.unshift(`ubuntu_ver="$(lsb_release -rs)"`);
   }
   parts.unshift(`\
 #!/usr/bin/env bash