Merge branch 'bootstrap_install_cargo_config' into 'master'

Install cargo-config from bootstrap script

See merge request redox-os/redox!1230

README.md

@@ -138,8 +138,8 @@ $ ./bootstrap.sh -d
 $ curl https://sh.rustup.rs -sSf | sh
 $ source $HOME/.cargo/env
 
-# Install the sysroot manager Xargo
+# Install the sysroot manager Xargo and cargo-config
-$ cargo install xargo
+$ cargo install xargo cargo-config
 
 # For successive builds start here. If this is your first build, just continue
 

bootstrap.sh

@@ -371,6 +371,18 @@ usage()
 	exit
 }
 
+
+#############################################################
+# Looks for and installs a cargo-managed binary or subcommand
+#############################################################
+cargoInstall() {
+	if [[ "`cargo install --list`" != *"$1"* ]]; then
+		cargo install $1
+	else
+		echo "You have $1 installed already!"
+	fi
+}
+
 ####################################################################################
 # This function takes care of everything associated to rust, and the version manager
 # That controls it, it can install rustup and uninstall multirust as well as making
@@ -481,11 +493,8 @@ boot()
 	echo "Cloning gitlab repo..."
 	git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
 	rustInstall
-	if [[ "`cargo install --list`" != *"xargo"* ]]; then
+	cargoInstall cargo-config
-		cargo install xargo
+	cargoInstall xargo
-	else
-		echo "You have xargo installed already!"
-	fi
 	echo "Cleaning up..."
 	rm bootstrap.sh
 	echo