handle case where $SUDO_USER is not set

author: Andrew Cady <d@jerkface.net> 2020-05-27 21:58:55 -0400
committer: Andrew Cady <d@jerkface.net> 2020-05-27 22:48:46 -0400
commit: 694309e7cae73b7f428238fc51242d1804c1cf4a (patch)
tree: 08ffcad6e55f11276371672a8174cb5c1e2c5701 /fsmgr.hs
parent: 1fc23d6d26a25557b5c5ef1a204ef573421f2706 (diff)
1 files changed, 1 insertions, 1 deletions
diff --git a/fsmgr.hs b/fsmgr.hs
index 3a59a53..ca80f8a 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -122,7 +122,7 @@ absPath f = do
 getHomeDir :: Action FilePath
 getHomeDir = do
-  Stdout homeDir <- cmd ["sh", "-c", "getent passwd \"$SUDO_USER\"|(IFS=: read _ _ _ _ _ d _; printf %s \"$d\")"]
+  Stdout homeDir <- cmd "sh -c" ["if [ \"$SUDO_USER\" ]; then getent passwd \"$SUDO_USER\" | cut -d: -f6; else printf \"%s\n\" \"$HOME\"; fi"]
  return homeDir
 buildInitialImage :: DiskImageConfig -> FilePath -> FilePath -> Action ()
author	Andrew Cady <d@jerkface.net>	2020-05-27 21:58:55 -0400
committer	Andrew Cady <d@jerkface.net>	2020-05-27 22:48:46 -0400
commit	694309e7cae73b7f428238fc51242d1804c1cf4a (patch)
tree	08ffcad6e55f11276371672a8174cb5c1e2c5701 /fsmgr.hs
parent	1fc23d6d26a25557b5c5ef1a204ef573421f2706 (diff)

diff --git a/fsmgr.hs b/fsmgr.hs index 3a59a53..ca80f8a 100644 --- a/fsmgr.hs +++ b/fsmgr.hs
@@ -122,7 +122,7 @@ absPath f = do
122		122
123	getHomeDir :: Action FilePath	123	getHomeDir :: Action FilePath
124	getHomeDir = do	124	getHomeDir = do
125	Stdout homeDir <- cmd ["sh", "-c", "getent passwd \"$SUDO_USER\"\|(IFS=: read _ _ _ _ _ d _; printf %s \"$d\")"]	125	Stdout homeDir <- cmd "sh -c" ["if [ \"$SUDO_USER\" ]; then getent passwd \"$SUDO_USER\" \| cut -d: -f6; else printf \"%s\n\" \"$HOME\"; fi"]
126	return homeDir	126	return homeDir
127		127
128	buildInitialImage :: DiskImageConfig -> FilePath -> FilePath -> Action ()	128	buildInitialImage :: DiskImageConfig -> FilePath -> FilePath -> Action ()