lots of misc updates

[distro-setup] / filesystem / etc / profile.d / environment.sh

diff --git a/filesystem/etc/profile.d/environment.sh b/filesystem/etc/profile.d/environment.sh
index ed621d6ad409caf6ab1daabc8bf8065688d0af3b..bc816738355aba0f3a7a290ed853b106cbd6e2f3 100644 (file)
--- a/filesystem/etc/profile.d/environment.sh
+++ b/filesystem/etc/profile.d/environment.sh
@@ -1,6 +1,3 @@
-export ACME_TINY_WRAPPER_CERT_DIR=/p/c/machine_specific/$HOSTNAME/webservercerts
-export ACME_TINY_PATH="/a/opt/acme-tiny/acme_tiny.py"
-
 if [ -f $HOME/path_add-function ]; then
     . $HOME/path_add-function
     path_add /usr/sbin /usr/local/sbin /sbin
@@ -63,7 +60,8 @@ fi
 # every user in a same group, so if you copy files there with exact
 # perms, that is probably not what you want. I don't use a system like
 # that. I don't care much either way, but the ubuntu one seems a bit
-# more user friendly.
-if (( EUID >= 1000 )); then
+# more user friendly, and copying files between them is a pita with
+# different umasks.
+if test "$(id -u)" -ge 1000; then
     umask 002
 fi