YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Fix upgrade/restore script

Browse source
This commit is contained in:
Julien Vaubourg 2016-05-14 21:24:20 +02:00
parent 852d331df3
commit 0637cdf401
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/install
View file

@ -49,14 +49,14 @@ if ! $upgrade; then
exit 1 exit 1
fi fi
fi
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl ${domain}${url_path} -a hotspot sudo yunohost app checkurl ${domain}${url_path} -a hotspot
if [ ! $? -eq 0 ]; then if [ ! $? -eq 0 ]; then
exit 1 exit 1
fi fi
fi
# Install packages # Install packages
packages='php5-fpm sipcalc hostapd iptables iw dnsmasq' packages='php5-fpm sipcalc hostapd iptables iw dnsmasq'
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
@ -134,10 +134,6 @@ if ! $upgrade; then
fi fi
# Save git commit
gitcommit=$(git rev-parse HEAD)
sudo yunohost app setting hotspot gitcommit -v "${gitcommit}"
# Install custom scripts # Install custom scripts
sudo install -o root -g root -m 0755 ../conf/iw_multissid /usr/local/bin/ sudo install -o root -g root -m 0755 ../conf/iw_multissid /usr/local/bin/
sudo install -o root -g root -m 0755 ../conf/iw_devices /usr/local/bin/ sudo install -o root -g root -m 0755 ../conf/iw_devices /usr/local/bin/

2
scripts/restore
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
gitcommit=$(sudo yunohost app setting hotspot gitcommit) gitcommit=$(sudo grep revision /etc/yunohost/apps/hotspot/status.json | sed 's/.*"revision": "\([^"]\+\)".*/\1/')
tmpdir=$(mktemp -dp /tmp/ hotspot-restore-XXXXX) tmpdir=$(mktemp -dp /tmp/ hotspot-restore-XXXXX)
git clone https://github.com/labriqueinternet/hotspot_ynh.git "${tmpdir}/" git clone https://github.com/labriqueinternet/hotspot_ynh.git "${tmpdir}/"

4
scripts/upgrade
View file

@ -27,13 +27,9 @@ export HOTSPOT_UPGRADE=1
sudo bash /etc/yunohost/apps/hotspot/scripts/remove &> /dev/null sudo bash /etc/yunohost/apps/hotspot/scripts/remove &> /dev/null
bash ./install "${domain}" "${path}" "${wifi_ssid}" "${wifi_passphrase}" "${firmware_nonfree}" bash ./install "${domain}" "${path}" "${wifi_ssid}" "${wifi_passphrase}" "${firmware_nonfree}"
gitcommit=$(ynh_setting hotspot gitcommit)
sudo cp -a "${tmpdir}/settings.yml" /etc/yunohost/apps/hotspot/ sudo cp -a "${tmpdir}/settings.yml" /etc/yunohost/apps/hotspot/
sudo rm -r "${tmpdir}/" sudo rm -r "${tmpdir}/"
sudo yunohost app setting hotspot gitcommit -v "${gitcommit}"
# Changes # Changes
if [ -z "$(ynh_setting hotspot ip6_firewall)" ]; then if [ -z "$(ynh_setting hotspot ip6_firewall)" ]; then