From 4758ffb1194e1d8471ab0f8abd4a41781dc13fda Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Sun, 13 Jan 2019 15:05:29 -0500
Subject: Change default ENV from cashrc to env.sh

---
 bin/cash/cash.1 | 2 +-
 bin/cash/var.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/cash/cash.1 b/bin/cash/cash.1
index 14c7aeca..55e7fa8e 100644
--- a/bin/cash/cash.1
+++ b/bin/cash/cash.1
@@ -142,7 +142,7 @@ The default value of
 .Ev ENV
 is:
 .Pp
-.Dl "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/cashrc"
+.Dl "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh"
 .
 .Pp
 The first non-option argument specified on the command line
diff --git a/bin/cash/var.c b/bin/cash/var.c
index e183eaa3..18e5de62 100644
--- a/bin/cash/var.c
+++ b/bin/cash/var.c
@@ -106,7 +106,7 @@ struct localvar *localvars;
 int forcelocal;
 
 static const struct varinit varinit[] = {
-	{ &venv, 0, "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/cashrc", NULL },
+	{ &venv, 0, "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh", NULL },
 #ifndef NO_HISTORY
 	{ &vhistsize,	VUNSET,				"HISTSIZE=",
 	  sethistsize },
-- 
cgit 1.4.1

/bin/1sh/miscbltin.c?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466'>tree</a> <a href='/src/commit/bin/1sh/miscbltin.c?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;follow=1'>commit</a> <a href='/src/diff/bin/1sh/miscbltin.c?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/1sh/miscbltin.c'>
<input type='hidden' name='id' value='de9409e3888ba92b0dca38ac81fe3e4b17e7f466'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;follow=1'>root</a>/<a href='/src/log/bin?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;follow=1'>bin</a>/<a href='/src/log/bin/1sh?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;follow=1'>1sh</a>/<a href='/src/log/bin/1sh/miscbltin.c?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;follow=1'>miscbltin.c</a> (<a href='/src/log/bin/1sh/miscbltin.c?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/1sh/miscbltin.c?id=de9409e3888ba92b0dca38ac81fe3e4b17e7f466&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-07-12 19:00:08 -0400'>2019-07-12</span></td><td><a href='/src/commit/bin/shotty.c?id=31e0530de40625b9284bde657896a7d4dffd13c9&amp;follow=1'>Add DCH to shotty</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-12 18:41:04 -0400'>2019-07-12</span></td><td><a href='/src/commit/bin/shotty.c?id=ac9f4093c4b0638ee522c9dda410ca221231857d&amp;follow=1'>Support insert mode in shotty</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-11 23:36:41 -0400'>2019-07-11</span></td><td><a href='/src/commit/bin/shotty.c?id=9d82c0e14146068902dafbddb6e6e31091bc7b68&amp;follow=1'>Don't do carriage return on line feed</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-11 17:44:39 -0400'>2019-07-11</span></td><td><a href='/src/commit/bin/shotty.c?id=18cd2253778a2f528b775f9e03443bf121777f22&amp;follow=1'>Interpret 256color-style SGRs</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-11 17:43:40 -0400'>2019-07-11</span></td><td><a href='/src/commit/bin/shotty.c?id=bd985953cf8c45a7d9a92ece8a986975c3ac496a&amp;follow=1'>Use inline style rather than &lt;b&gt;, &lt;i&gt;, &lt;u&gt;</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-11 17:37:31 -0400'>2019-07-11</span></td><td><a href='/src/commit/bin/shotty.c?id=41a07d3f1c055cfaf0733b7d081ab07800de1ced&amp;follow=1'>Factor out clear</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-11 17:25:10 -0400'>2019-07-11</span></td><td><a href='/src/commit/bin/shotty.c?id=5fa21ca1b98ac74bd603fc1e1a504c98bd4bed27&amp;follow=1'>Add bright option to shotty</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-11 17:11:39 -0400'>2019-07-11</span></td><td><a href='/src/commit/bin/shotty.c?id=ff43ade74b8e788b28a4eb74b1b688f803d30e8c&amp;follow=1'>Output &lt;b&gt;, &lt;i&gt;, &lt;u&gt; in shotty</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-10 00:24:15 -0400'>2019-07-10</span></td><td><a href='/src/commit/bin/shotty.c?id=f5ee01ed6a0e55d81b969e13e1fab8994c28294d&amp;follow=1'>Ignore SM and RM</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-09 23:47:27 -0400'>2019-07-09</span></td><td><a href='/src/commit/bin/man1/shotty.1?id=a0c03a0c48e81b58e843f1168faec1722016cedb&amp;follow=1'>Add shotty man page and build it</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-09 23:35:52 -0400'>2019-07-09</span></td><td><a href='/src/commit/bin/up.sh?id=58542b1affb49206ecb8746dfa822dba232931a2&amp;follow=1'>Add up -c</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-09 23:18:51 -0400'>2019-07-09</span></td><td><a href='/src/commit/bin/shotty.c?id=ce55e9252c53384d241accfa56be1adeffa2e59b&amp;follow=1'>Add options for default colors to shotty</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2019-07-08 22:48:04 -0400'>2019-07-08</span></td><td><a href='/src/commit/bin/shotty.c?id=bf233ce41d17e582bb1fff14af8f5a42f3c83c9d&amp;follow=1'>Use char literals consistently</a></td><td>June McEnroe