Merge pull request #55 from aminya/untildify-mac [skip ci]

.github/workflows/CI.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   Test:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip test]') }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -81,6 +81,7 @@ jobs:
         continue-on-error: ${{ contains(matrix.os, 'ubuntu-18.04') }}
 
   Docker:
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip docker]') }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

building/docker/ubuntu_stable_node.dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 # set time-zone
 ENV TZ=Canada/Pacific
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-# The nodejs that ships on ubuntu:latest servers is too old.
+# The nodejs that ships on ubuntu:20.04 servers is too old.
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends curl gnupg ca-certificates

src/utils/path/untildify.ts

@@ -5,7 +5,11 @@ import { isRoot } from "../env/sudo"
 export function untildify_user(path: string) {
   if (isRoot() && typeof process.env.SUDO_USER === "string") {
     // use the user profile even if root
-    return join("/home/", process.env.SUDO_USER, path)
+    if (process.platform === "darwin") {
+      return join("/Users/", process.env.SUDO_USER, path)
+    } else {
+      return join("/home/", process.env.SUDO_USER, path)
+    }
   } else {
     return untildify(`~/${path}`)
   }