From 5d8504b9789ffebabe8226227c4061dd48354177 Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Wed, 29 Apr 2020 14:02:37 -0600
Subject: [PATCH 1/2] rename nix run to nix shell and nix app to nix run

---
 src/nix/{shell.cc => dev-shell.cc} |  0
 src/nix/run.cc                     | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename src/nix/{shell.cc => dev-shell.cc} (100%)

diff --git a/src/nix/shell.cc b/src/nix/dev-shell.cc
similarity index 100%
rename from src/nix/shell.cc
rename to src/nix/dev-shell.cc
diff --git a/src/nix/run.cc b/src/nix/run.cc
index 901b87fbb..f14e221e2 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -57,11 +57,11 @@ struct RunCommon : virtual Command
     }
 };
 
-struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
+struct CmdShell : InstallablesCommand, RunCommon, MixEnvironment
 {
     std::vector<std::string> command = { getEnv("SHELL").value_or("bash") };
 
-    CmdRun()
+    CmdShell()
     {
         mkFlag()
             .longName("command")
@@ -85,19 +85,19 @@ struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
         return {
             Example{
                 "To start a shell providing GNU Hello from NixOS 17.03:",
-                "nix run -f channel:nixos-17.03 hello"
+                "nix shell -f channel:nixos-17.03 hello"
             },
             Example{
                 "To start a shell providing youtube-dl from your 'nixpkgs' channel:",
-                "nix run nixpkgs#youtube-dl"
+                "nix shell nixpkgs#youtube-dl"
             },
             Example{
                 "To run GNU Hello:",
-                "nix run nixpkgs#hello -c hello --greeting 'Hi everybody!'"
+                "nix shell nixpkgs#hello -c hello --greeting 'Hi everybody!'"
             },
             Example{
                 "To run GNU Hello in a chroot store:",
-                "nix run --store ~/my-nix nixpkgs#hello -c hello"
+                "nix shell --store ~/my-nix nixpkgs#hello -c hello"
             },
         };
     }
@@ -141,13 +141,13 @@ struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
     }
 };
 
-static auto r1 = registerCommand<CmdRun>("run");
+static auto r1 = registerCommand<CmdShell>("shell");
 
-struct CmdApp : InstallableCommand, RunCommon
+struct CmdRun : InstallableCommand, RunCommon
 {
     std::vector<std::string> args;
 
-    CmdApp()
+    CmdRun()
     {
         expectArgs("args", &args);
     }
@@ -162,7 +162,7 @@ struct CmdApp : InstallableCommand, RunCommon
         return {
             Example{
                 "To run Blender:",
-                "nix app blender-bin"
+                "nix run blender-bin"
             },
         };
     }
@@ -192,7 +192,7 @@ struct CmdApp : InstallableCommand, RunCommon
     }
 };
 
-static auto r2 = registerCommand<CmdApp>("app");
+static auto r2 = registerCommand<CmdRun>("run");
 
 void chrootHelper(int argc, char * * argv)
 {

From f459ca547fda4b0ca477d895413e86b69a580ab0 Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Wed, 29 Apr 2020 15:37:21 -0600
Subject: [PATCH 2/2] rename run to shell in tests

---
 tests/local.mk                     |  2 +-
 tests/run.sh                       | 28 ----------------------------
 tests/{run.nix => shell-hello.nix} |  0
 tests/shell.sh                     | 28 ++++++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 tests/run.sh
 rename tests/{run.nix => shell-hello.nix} (100%)
 create mode 100644 tests/shell.sh

diff --git a/tests/local.mk b/tests/local.mk
index 24a001bd2..d10d882c3 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -21,7 +21,7 @@ nix_tests = \
   fetchGitSubmodules.sh \
   fetchMercurial.sh \
   signing.sh \
-  run.sh \
+  shell.sh \
   brotli.sh \
   pure-eval.sh \
   check.sh \
diff --git a/tests/run.sh b/tests/run.sh
deleted file mode 100644
index d1dbfd6bd..000000000
--- a/tests/run.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-source common.sh
-
-clearStore
-clearCache
-
-nix run -f run.nix hello -c hello | grep 'Hello World'
-nix run -f run.nix hello -c hello NixOS | grep 'Hello NixOS'
-
-if ! canUseSandbox; then exit; fi
-
-chmod -R u+w $TEST_ROOT/store0 || true
-rm -rf $TEST_ROOT/store0
-
-clearStore
-
-path=$(nix eval --raw -f run.nix hello)
-
-# Note: we need the sandbox paths to ensure that the shell is
-# visible in the sandbox.
-nix run --sandbox-build-dir /build-tmp \
-    --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' \
-    --store $TEST_ROOT/store0 -f run.nix hello -c hello | grep 'Hello World'
-
-path2=$(nix run --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' --store $TEST_ROOT/store0 -f run.nix hello -c $SHELL -c 'type -p hello')
-
-[[ $path/bin/hello = $path2 ]]
-
-[[ -e $TEST_ROOT/store0/nix/store/$(basename $path)/bin/hello ]]
diff --git a/tests/run.nix b/tests/shell-hello.nix
similarity index 100%
rename from tests/run.nix
rename to tests/shell-hello.nix
diff --git a/tests/shell.sh b/tests/shell.sh
new file mode 100644
index 000000000..7a9ee8ab0
--- /dev/null
+++ b/tests/shell.sh
@@ -0,0 +1,28 @@
+source common.sh
+
+clearStore
+clearCache
+
+nix shell -f shell-hello.nix hello -c hello | grep 'Hello World'
+nix shell -f shell-hello.nix hello -c hello NixOS | grep 'Hello NixOS'
+
+if ! canUseSandbox; then exit; fi
+
+chmod -R u+w $TEST_ROOT/store0 || true
+rm -rf $TEST_ROOT/store0
+
+clearStore
+
+path=$(nix eval --raw -f shell-hello.nix hello)
+
+# Note: we need the sandbox paths to ensure that the shell is
+# visible in the sandbox.
+nix shell --sandbox-build-dir /build-tmp \
+    --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' \
+    --store $TEST_ROOT/store0 -f shell-hello.nix hello -c hello | grep 'Hello World'
+
+path2=$(nix shell --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' --store $TEST_ROOT/store0 -f shell-hello.nix hello -c $SHELL -c 'type -p hello')
+
+[[ $path/bin/hello = $path2 ]]
+
+[[ -e $TEST_ROOT/store0/nix/store/$(basename $path)/bin/hello ]]