diff --git a/README.md b/README.md index 28648ab..2407829 100755 --- a/README.md +++ b/README.md @@ -27,11 +27,9 @@ Automatically fill a [lancache](https://github.com/zeropingheroes/lancache) with * Dependencies detailed in *Installation* section # Installation -1. `sudo apt update -y` -2. `sudo apt install -y lib32gcc1 lib32stdc++6 lib32tinfo5 lib32ncurses5 php7.2-cli php7.2-mbstring php7.2-sqlite php7.2-bcmath php7.2-dom composer expect zip unzip` -3. `git clone https://github.com/zeropingheroes/lancache-autofill.git && cd lancache-autofill` -4. `./install.sh` -5. Get a Steam API key from http://steamcommunity.com/dev/apikey and add it to the `.env` file +1. `git clone https://github.com/zeropingheroes/lancache-autofill.git && cd lancache-autofill` +2. `./install.sh` +3. Get a Steam API key from http://steamcommunity.com/dev/apikey and add it to the `.env` file # Usage diff --git a/Vagrantfile b/Vagrantfile index d3811b1..565ee0e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -17,10 +17,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| v.customize ["modifyvm", :id, "--uartmode1", "disconnected" ] end - config.vm.provision "apt", - type: "shell", - inline: "apt update && apt install -y lib32gcc1 lib32stdc++6 lib32tinfo5 lib32ncurses5 php7.2-cli php7.2-mbstring php7.2-sqlite php7.2-bcmath composer expect zip unzip" - config.vm.provision "project", type: "shell", privileged: false, diff --git a/install.sh b/install.sh index 4caca6d..cf2654e 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,12 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" GREEN='\033[0;32m' BLACK='\033[0m' -printf "${GREEN}Installing dependencies with Composer${BLACK}\n" +printf "${GREEN}Installing apt package dependencies${BLACK}\n" +sudo apt update -y +sudo apt install -y lib32gcc1 lib32stdc++6 lib32tinfo5 lib32ncurses5 composer expect zip unzip \ + php7.2-cli php7.2-mbstring php7.2-sqlite \php7.2-bcmath php7.2-dom + +printf "${GREEN}Installing PHP dependencies with Composer${BLACK}\n" cd $SCRIPT_DIR && composer install printf "${GREEN}Creating database file${BLACK}\n"