From a3709ad68fc7673011d3b8f7642307f271b11efe Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Thu, 21 Nov 2019 17:14:43 -0500
Subject: Revert "Set default ENV to ~/.config/cash/cashrc"

This reverts commit 7bcd786e3dd7a5e2c064a1fd0dcb68cf0506ca2f.
---
 bin/1sh/1sh.1 | 12 +++++++++---
 bin/1sh/var.c |  6 ------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'bin/1sh')

diff --git a/bin/1sh/1sh.1 b/bin/1sh/1sh.1
index 1dbefe09..2a27e704 100644
--- a/bin/1sh/1sh.1
+++ b/bin/1sh/1sh.1
@@ -138,11 +138,17 @@ at login time in the
 file, and commands that are executed for every shell inside the
 .Ev ENV
 file.
-The default value of
+The user can set the
 .Ev ENV
-is:
+variable to some file by placing the following line in the file
+.Pa .profile
+in the home directory,
+substituting for
+.Pa .shrc
+the filename desired:
+.
 .Pp
-.Dl "ENV=$XDG_CONFIG_HOME/1sh/env.sh"
+.Dl "ENV=$HOME/.shrc; export ENV"
 .
 .Pp
 The first non-option argument specified on the command line
diff --git a/bin/1sh/var.c b/bin/1sh/var.c
index 8a0d4418..2c006c0e 100644
--- a/bin/1sh/var.c
+++ b/bin/1sh/var.c
@@ -89,7 +89,6 @@ struct var vhistfile;
 struct var vhistsize;
 struct var vterm;
 #endif
-struct var venv;
 struct var vifs;
 struct var vmail;
 struct var vmpath;
@@ -106,12 +105,7 @@ struct var vdisvfork;
 struct localvar *localvars;
 int forcelocal;
 
-#define XDG_CONFIG_HOME "${XDG_CONFIG_HOME:-${HOME}/.config}"
-#define XDG_DATA_HOME "${XDG_DATA_HOME:-${HOME}/.local/share}"
-
 static const struct varinit varinit[] = {
-	{ &venv, 0, "ENV=" XDG_CONFIG_HOME "/1sh/env.sh",
-	  NULL },
 #ifndef NO_HISTORY
 	{ &vhistfile,	VUNSET,				"HISTFILE=",
 	  sethistfile },
-- 
cgit 1.4.1