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

Merge pull request #36 from kemenaran/macos-portability

Browse source 
Fix macOS/BSD portability
This commit is contained in:
Laurent Peuch 2018-01-14 16:41:53 +01:00 • committed by GitHub
commit cd1ceade89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ynh-dev
View file

@ -175,12 +175,12 @@ elif [ "$1" = "run" ]; then
} }
# Adapt vagrantfile # Adapt vagrantfile
sed -i "/ ### END AUTOMATIC YNH-DEV ###/ i \\ perl -i -pe "s| (### END AUTOMATIC YNH-DEV ###)|\
config.vm.define \"${VMNAME}\" do |${VMNAME}| \ config.vm.define \"${VMNAME}\" do \|${VMNAME}\| \
\n ${VMNAME}.vm.box = \"${BOX_NAME}\" \ \n ${VMNAME}.vm.box = \"${BOX_NAME}\" \
\n ${VMNAME}.vm.network :private_network, ip: \"${IP}\" \ \n ${VMNAME}.vm.network :private_network, ip: \"${IP}\" \
\n end \ \n end \
\n" ./Vagrantfile \n \1|" ./Vagrantfile
} }
# Run VM # Run VM
@ -190,7 +190,7 @@ VERSION as stable, testing or unstable /!\ "
vagrant up $VMNAME --provider virtualbox vagrant up $VMNAME --provider virtualbox
# Warn user about hosts file # Warn user about hosts file
IP_LINE="\s\s*${VMNAME}.vm.network\s\s*:private_network,\s*ip:\s*\"" IP_LINE="[[:space:]]*${VMNAME}.vm.network[[:space:]]*:private_network,[[:space:]]*ip:[[:space:]]*\""
IP=$(grep "$IP_LINE" Vagrantfile | sed "s/${IP_LINE}//" | tr -d '"') IP=$(grep "$IP_LINE" Vagrantfile | sed "s/${IP_LINE}//" | tr -d '"')
echo "/!\ Please add '$IP $DOMAIN' to your /etc/hosts file /!\\" echo "/!\ Please add '$IP $DOMAIN' to your /etc/hosts file /!\\"
echo "sudo bash -c 'echo \"$IP $DOMAIN\" >> /etc/hosts'" echo "sudo bash -c 'echo \"$IP $DOMAIN\" >> /etc/hosts'"