Modified Vagrantfile to remove sudo from the installation process
Included -a option to encapsulate -emfrti to install all dependencies
Change-Id: Ief864f4c7c69a80cfc47fc1ef195a2842c11011d
refs: #4423, #4404
diff --git a/INSTALL.md b/INSTALL.md
index b8348ed..e908a8b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -16,7 +16,7 @@
else if you don't have the dependencies, the following command will install them along with Mini-NDN:
- sudo ./install.sh -emrfti
+ sudo ./install.sh -a
else if you want to install the dependencies manually, follow the instructions below:
diff --git a/Vagrantfile b/Vagrantfile
index 071a885..6083675 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,7 +5,7 @@
git clone --depth 1 https://github.com/named-data/mini-ndn.git
cd mini-ndn
-sudo ./install.sh -emrfti
+./install.sh -a
SCRIPT
Vagrant.configure(2) do |config|
diff --git a/install.sh b/install.sh
index ecf0d0f..f65ac0d 100755
--- a/install.sh
+++ b/install.sh
@@ -220,9 +220,10 @@
}
function usage {
- printf '\nUsage: %s [-mfrti]\n\n' $(basename $0) >&2
+ printf '\nUsage: %s [-a]\n\n' $(basename $0) >&2
printf 'options:\n' >&2
+ printf -- ' -a: install all the required dependencies\n' >&2
printf -- ' -e: install infoedit\n' >&2
printf -- ' -f: install NFD\n' >&2
printf -- ' -i: install mini-ndn\n' >&2
@@ -235,9 +236,18 @@
if [[ $# -eq 0 ]]; then
usage
else
- while getopts 'emfrti' OPTION
+ while getopts 'aemfrti' OPTION
do
case $OPTION in
+ a)
+ infoedit
+ forwarder
+ minindn
+ mininet
+ routing
+ tools
+ break
+ ;;
e) infoedit;;
f) forwarder;;
i) minindn;;