From 9cc4cba06540475c9618b23eb1ea2eb3a9d04abe Mon Sep 17 00:00:00 2001
From: Edwin Brady <ecb10@st-andrews.ac.uk>
Date: Wed, 20 May 2020 13:31:04 +0100
Subject: [PATCH] Change executable name

I think we can be the official Idris2 now
---
 INSTALL.md     | 10 ++++++++--
 Makefile       |  2 +-
 config.mk      |  2 +-
 idris2.ipkg    |  2 +-
 idris2rkt.ipkg |  2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 46946c7a5..517abba88 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -61,7 +61,13 @@ If all is well, to install, type:
 If you have [Idris-2-in-Idris-1](https://github.com/edwinb/Idris2-boot)
 installed: 
 
-* `make all && make install`
+* `make all IDRIS2_BOOT=idris2boot`
+* `make install IDRIS2_BOOT=idris2boot`
+
+If you have an earlier version of this Idris 2 installer
+
+* `make all`
+* `make install`
 
 3: (Optional) Self-hosting step
 -------------------------------
@@ -71,7 +77,7 @@ that everything has worked correctly.  Assuming that `idris2sh` is in your
 `PATH`.
 
 * `make clean` -- to make sure you're building everything with the new version
-* `make all IDRIS2_BOOT=idris2sh && make install`
+* `make all && make install`
 
 4: Running tests
 ----------------
diff --git a/Makefile b/Makefile
index d55ac491d..ff93dc0eb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ include config.mk
 export IDRIS2_BOOT ?= idris2
 
 # Idris 2 executable we're building
-NAME = idris2sh
+NAME = idris2
 TARGETDIR = build/exec
 TARGET = ${TARGETDIR}/${NAME}
 
diff --git a/config.mk b/config.mk
index 86d182f53..6237d05ed 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,6 @@
 ##### Options which a user might set before building go here #####
 
-PREFIX ?= $(HOME)/.idris2sh
+PREFIX ?= $(HOME)/.idris2
 
 # clang compiles the output much faster than gcc!
 CC := clang
diff --git a/idris2.ipkg b/idris2.ipkg
index 5af5dbb57..f54db6b17 100644
--- a/idris2.ipkg
+++ b/idris2.ipkg
@@ -148,4 +148,4 @@ depends = contrib, network
 sourcedir = "src"
 
 main = Idris.Main
-executable = idris2sh
+executable = idris2
diff --git a/idris2rkt.ipkg b/idris2rkt.ipkg
index 74a2348f1..2e2b97ff7 100644
--- a/idris2rkt.ipkg
+++ b/idris2rkt.ipkg
@@ -149,4 +149,4 @@ depends = contrib, network
 sourcedir = "src"
 
 main = Idris.Main
-executable = idris2sh
+executable = idris2