From c9f391dfc1d5808831c45514ac3a81fe2a28d139 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Fri, 19 Jun 2015 10:11:40 -0700 Subject: [PATCH] Update the installation process --- Tools/capp_env/Jakefile | 13 +++++-------- Tools/capp_env/README.md | 2 +- Tools/capp_env/install.sh | 9 --------- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100755 Tools/capp_env/install.sh diff --git a/Tools/capp_env/Jakefile b/Tools/capp_env/Jakefile index fd6dd37506..76516aa8e5 100644 --- a/Tools/capp_env/Jakefile +++ b/Tools/capp_env/Jakefile @@ -1,12 +1,9 @@ require ("../../common.jake"); -var OS = require("os"), - task = require("jake").task; +var FILE = require("file"), + SYSTEM = require("system"), + path = FILE.Path(FILE.join(SYSTEM.prefix, "bin", "capp_env")); -task ("build", function() -{ - sudo(["./install.sh"]); -}); - -task ("default", ["build"]); \ No newline at end of file +sudo(["cp", "-f", "capp_env", path]); +sudo(["chmod", "755", path]); diff --git a/Tools/capp_env/README.md b/Tools/capp_env/README.md index 4d6458a415..4cae152a53 100644 --- a/Tools/capp_env/README.md +++ b/Tools/capp_env/README.md @@ -36,7 +36,7 @@ If you install the Cappuccino source while in an virtual env, all the tools will Just close the current terminal, or run - deactivate + capp_env_deactivate ## TODOs diff --git a/Tools/capp_env/install.sh b/Tools/capp_env/install.sh deleted file mode 100755 index 7ecc1e1621..0000000000 --- a/Tools/capp_env/install.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -chmod +x capp_env - -if [[ ! -d /usr/local/narwhal/bin ]]; then - mkdir -p /usr/local/narwhal/bin -fi - -cp capp_env /usr/local/narwhal/bin \ No newline at end of file