YunoHost/ynh-dev
1
0
Fork 0
mirror of https://github.com/YunoHost/ynh-dev.git synced 2024-09-03 20:05:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] remove trailing spaces

Browse source
This commit is contained in:
Laurent Peuch 2016-01-22 20:13:57 +01:00
parent 0f50d2ed37
commit 565792515d
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ynh-dev
View file

@ -11,7 +11,7 @@ Usage :
Run a docker or virtualbox vm Run a docker or virtualbox vm
`basename $0` kill VM `basename $0` kill VM
Kill the last docker or all vagrant Kill the last docker or all vagrant
Inside the vm Inside the vm
`basename $0` ip `basename $0` ip
Give the ip of the guest container Give the ip of the guest container
@ -21,17 +21,17 @@ Usage :
Deploy sources to test it Deploy sources to test it
`basename $0` watch [PAQUET [PAQUET ...]] `basename $0` watch [PAQUET [PAQUET ...]]
Deploy sources each time there is change Deploy sources each time there is change
PAQUET : PAQUET :
moulinette moulinette
ssowat ssowat
yunohost yunohost
yunohost-admin yunohost-admin
VM VM
docker docker
virtualbox virtualbox
VERSION VERSION
stable8 stable8
testing8 testing8
@ -59,7 +59,7 @@ BASE_DIR=/yunohost
if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "help" ]; then if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "help" ]; then
usage usage
elif [ "$1" = "create-env" ]; then elif [ "$1" = "create-env" ]; then
#Create a development environment #Create a development environment
pwd=`pwd` pwd=`pwd`
@ -73,14 +73,14 @@ elif [ "$1" = "create-env" ]; then
git clone https://github.com/YunoHost/Dockerfile Dockerfile git clone https://github.com/YunoHost/Dockerfile Dockerfile
git clone https://github.com/zamentur/yunohost-vagrant yunohost-vagrant git clone https://github.com/zamentur/yunohost-vagrant yunohost-vagrant
cp $pwd/$0 ./$0 cp $pwd/$0 ./$0
ln -s yunohost-vagrant/Vagrantfile Vagrantfile ln -s yunohost-vagrant/Vagrantfile Vagrantfile
elif [ "$1" = "run" ]; then elif [ "$1" = "run" ]; then
#Run a vm and give a prompt #Run a vm and give a prompt
DOMAIN=$2 DOMAIN=$2
VM=$3 VM=$3
VERSION=$4 VERSION=$4
if [ "$VM" = "docker" ]; then if [ "$VM" = "docker" ]; then
docker exec -t -i $(sudo docker run -h yunohost.$DOMAIN -v $(pwd):/yunohost -d zamentur/yunohost-$VERSION /sbin/init) /bin/bash docker exec -t -i $(sudo docker run -h yunohost.$DOMAIN -v $(pwd):/yunohost -d zamentur/yunohost-$VERSION /sbin/init) /bin/bash
elif [ "$VM" = "virtualbox" ] || [ "$VM" = "vagrant" ]; then elif [ "$VM" = "virtualbox" ] || [ "$VM" = "vagrant" ]; then
@ -90,7 +90,7 @@ elif [ "$1" = "run" ]; then
echo "This kind of VM is not supported" echo "This kind of VM is not supported"
exit 100; exit 100;
fi fi
elif [ "$1" = "kill" ]; then elif [ "$1" = "kill" ]; then
VM=$2 VM=$2
if [ "$VM" = "docker" ]; then if [ "$VM" = "docker" ]; then
@ -100,17 +100,17 @@ elif [ "$1" = "kill" ]; then
else else
echo "This kind of VM is not supported" echo "This kind of VM is not supported"
exit 100; exit 100;
fi fi
elif [ "$1" = "upgrade" ]; then elif [ "$1" = "upgrade" ]; then
check_yunohost_vm check_yunohost_vm
sudo apt-get update sudo apt-get update
sudo apt-get -y upgrade sudo apt-get -y upgrade
sudo apt-get -y dist-upgrade sudo apt-get -y dist-upgrade
sudo apt-get install -y inotify-tools net-tools sudo apt-get install -y inotify-tools net-tools
elif [ "$1" = "ip" ]; then elif [ "$1" = "ip" ]; then
check_yunohost_vm check_yunohost_vm
sudo apt-get install -y net-tools sudo apt-get install -y net-tools
/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}' /sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'
elif [ "$1" = "deploy" ]; then elif [ "$1" = "deploy" ]; then
check_yunohost_vm check_yunohost_vm
for i in ${!paquets[@]}; do for i in ${!paquets[@]}; do
@ -146,8 +146,8 @@ elif [ "$1" = "deploy" ]; then
elif [ "$1" = "watch" ]; then elif [ "$1" = "watch" ]; then
check_yunohost_vm check_yunohost_vm
sudo apt-get install -y inotify-tools sudo apt-get install -y inotify-tools
while inotifywait -r -e close_write $BASE_DIR/moulinette/ $BASE_DIR/SSOwat/ $BASE_DIR/yunohost/ $BASE_DIR/yunohost-admin/; do while inotifywait -r -e close_write $BASE_DIR/moulinette/ $BASE_DIR/SSOwat/ $BASE_DIR/yunohost/ $BASE_DIR/yunohost-admin/; do
$BASE_DIR/$0 deploy ${@:2}; $BASE_DIR/$0 deploy ${@:2};
done done
else else
usage usage