[fix] Don't break naming retrocompat

This commit is contained in:
ljf 2017-06-03 11:06:21 +02:00
parent a609c7a54b
commit 962bec6d85
2 changed files with 10 additions and 10 deletions

View file

@ -74,7 +74,7 @@ This command create a clone of main git repositories and organize its.
This command is a helper to run a Vagrant virtual machine in the right place with YunoHost installed (but not postinstalled). This command is a helper to run a Vagrant virtual machine in the right place with YunoHost installed (but not postinstalled).
```shell ```shell
cd /path/to/dev/env cd /path/to/dev/env
./ynh-dev run ynh.local unstable64 ./ynh-dev run ynh.local unstable
``` ```
The `run` command takes 2 arguments: domain and YunoHost version. The `run` command takes 2 arguments: domain and YunoHost version.
@ -163,7 +163,7 @@ To kill the vm, just do on your host:
```shell ```shell
cd /path/to/dev/env cd /path/to/dev/env
vagrant destroy unstable64 vagrant destroy unstable
# or # or
./ynh-dev kill ./ynh-dev kill
``` ```
@ -172,7 +172,7 @@ To suspend the vm
```shell ```shell
cd /path/to/dev/env cd /path/to/dev/env
vagrant suspend unstable64 vagrant suspend unstable
``` ```
## 2. Directly on a YunoHost instance ## 2. Directly on a YunoHost instance

14
ynh-dev
View file

@ -32,9 +32,9 @@ VERSION
stable32 stable32
testing32 testing32
unstable32 unstable32
stable64 stable
testing64 testing
unstable64 unstable
EOF EOF
} }
@ -102,7 +102,7 @@ elif [ "$1" = "create-env" ]; then
elif [ "$1" = "run" ]; then elif [ "$1" = "run" ]; then
DOMAIN=$2 DOMAIN=$2
VERSION='stable64' VERSION='stable'
if [ "$#" = "3" ]; then if [ "$#" = "3" ]; then
VERSION=$3 VERSION=$3
fi fi
@ -111,15 +111,15 @@ elif [ "$1" = "run" ]; then
echo "" echo ""
# Get vagrant box info from version # Get vagrant box info from version
if [ "$VERSION" = "stable64" ]; then if [ "$VERSION" = "stable" ]; then
BOX_NAME="yunohost/jessie-amd64-stable" BOX_NAME="yunohost/jessie-amd64-stable"
BOX_URL="https://build.yunohost.org/yunohost-jessie-amd64-stable.box" BOX_URL="https://build.yunohost.org/yunohost-jessie-amd64-stable.box"
IP="192.168.33.80" IP="192.168.33.80"
elif [ "$VERSION" = "testing64" ]; then elif [ "$VERSION" = "testing" ]; then
BOX_NAME="yunohost/jessie-amd64-testing" BOX_NAME="yunohost/jessie-amd64-testing"
BOX_URL="https://build.yunohost.org/yunohost-jessie-amd64-testing.box" BOX_URL="https://build.yunohost.org/yunohost-jessie-amd64-testing.box"
IP="192.168.33.81" IP="192.168.33.81"
elif [ "$VERSION" = "unstable64" ]; then elif [ "$VERSION" = "unstable" ]; then
BOX_NAME="yunohost/jessie-amd64-unstable" BOX_NAME="yunohost/jessie-amd64-unstable"
BOX_URL="https://build.yunohost.org/yunohost-jessie-amd64-unstable.box" BOX_URL="https://build.yunohost.org/yunohost-jessie-amd64-unstable.box"
IP="192.168.33.82" IP="192.168.33.82"