From 895808e945ab9e3c51d39df777de0f4e61bb9044 Mon Sep 17 00:00:00 2001 From: Benjamin Sago Date: Mon, 2 Oct 2017 10:22:50 +0200 Subject: [PATCH] =?UTF-8?q?Show=20friendlier=20warnings=20when=20binaries?= =?UTF-8?q?=20don=E2=80=99t=20exist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, allow the --release flags to be passed to the build-exa and test-exa commands. --- Vagrantfile | 8 ++++---- devtools/dev-run-debug.sh | 7 +++++++ devtools/dev-run-release.sh | 7 +++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100755 devtools/dev-run-debug.sh create mode 100755 devtools/dev-run-release.sh diff --git a/Vagrantfile b/Vagrantfile index 89ba996..760b16f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -63,13 +63,13 @@ Vagrant.configure(2) do |config| config.vm.provision :shell, privileged: true, inline: <<-EOF set -xe - echo -e "#!/bin/sh\n/home/#{developer}/target/debug/exa \"\\$*\"" > /usr/bin/exa - echo -e "#!/bin/sh\n/home/#{developer}/target/release/exa \"\\$*\"" > /usr/bin/rexa + ln -sf /vagrant/devtools/dev-run-debug.sh /usr/bin/exa + ln -sf /vagrant/devtools/dev-run-release.sh /usr/bin/rexa - echo -e "#!/bin/sh\ncargo build --manifest-path /vagrant/Cargo.toml" > /usr/bin/build-exa + echo -e "#!/bin/sh\ncargo build --manifest-path /vagrant/Cargo.toml \\$@" > /usr/bin/build-exa ln -sf /usr/bin/build-exa /usr/bin/b - echo -e "#!/bin/sh\ncargo test --manifest-path /vagrant/Cargo.toml --lib -- --quiet" > /usr/bin/test-exa + echo -e "#!/bin/sh\ncargo test --manifest-path /vagrant/Cargo.toml --lib \\$@ -- --quiet" > /usr/bin/test-exa ln -sf /usr/bin/test-exa /usr/bin/t echo -e "#!/bin/sh\n/vagrant/xtests/run.sh" > /usr/bin/run-xtests diff --git a/devtools/dev-run-debug.sh b/devtools/dev-run-debug.sh new file mode 100755 index 0000000..83b96fe --- /dev/null +++ b/devtools/dev-run-debug.sh @@ -0,0 +1,7 @@ +#!/bin/bash +if [[ -f ~/target/debug/exa ]]; then + ~/target/debug/exa "$@" +else + echo -e "Debug exa binary does not exist!" + echo -e "Run \033[32;1mb\033[0m or \033[32;1mbuild-exa\033[0m to create it" +fi diff --git a/devtools/dev-run-release.sh b/devtools/dev-run-release.sh new file mode 100755 index 0000000..314e015 --- /dev/null +++ b/devtools/dev-run-release.sh @@ -0,0 +1,7 @@ +#!/bin/bash +if [[ -f ~/target/release/exa ]]; then + ~/target/release/exa "$@" +else + echo -e "Release exa binary does not exist!" + echo -e "Run \033[32;1mb --release\033[0m or \033[32;1mbuild-exa --release\033[0m to create it" +fi