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

Revert "now using ynh_secure_remove helper"

Browse source 
This reverts commit e4c80d4c6b.
This commit is contained in:
keoma 2019-02-09 12:55:45 +01:00
parent e4c80d4c6b
commit e4ea067b26
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/_common.sh
View file

@ -29,7 +29,7 @@ function ynh_systemctl()
# Save and release the lock... # Save and release the lock...
cp $LOCKFILE $LOCKFILE.bkp.$$ cp $LOCKFILE $LOCKFILE.bkp.$$
ynh_secure_remove $LOCKFILE rm $LOCKFILE
# Wait for the end of the action # Wait for the end of the action
wait $SYSCTLACTION wait $SYSCTLACTION

18
scripts/remove
View file

@ -39,18 +39,18 @@ firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree)
systemctl stop ynh-hotspot systemctl stop ynh-hotspot
systemctl disable ynh-hotspot systemctl disable ynh-hotspot
yunohost service remove ynh-hotspot yunohost service remove ynh-hotspot
ynh_secure_remove /etc/systemd/system/ynh-hotspot.service /usr/local/bin/ynh-hotspot rm -f /etc/systemd/system/ynh-hotspot.service /usr/local/bin/ynh-hotspot
ynh_secure_remove /tmp/.ynh-hotspot-* rm -f /tmp/.ynh-hotspot-*
# Update firewall for DHCP # Update firewall for DHCP
yunohost firewall disallow --ipv6 UDP 547 yunohost firewall disallow --ipv6 UDP 547
yunohost firewall disallow UDP 67 yunohost firewall disallow UDP 67
# Remove confs # Remove confs
ynh_secure_remove /etc/dnsmasq.dhcpd/ rm -fr /etc/dnsmasq.dhcpd/
ynh_secure_remove /etc/hostapd/hostapd.conf{.tpl?,} rm -f /etc/hostapd/hostapd.conf{.tpl?,}
ynh_secure_remove /etc/nginx/conf.d/${domain}.d/wifiadmin.conf rm -f /etc/nginx/conf.d/${domain}.d/wifiadmin.conf
ynh_secure_remove /etc/php5/fpm/pool.d/wifiadmin.conf rm -f /etc/php5/fpm/pool.d/wifiadmin.conf
# Remove packages # Remove packages
if [[ $firmware_nonfree == yes ]]; then if [[ $firmware_nonfree == yes ]]; then
@ -60,8 +60,8 @@ else
# Remove free firmwares # Remove free firmwares
if ! dpkg -l firmware-atheros &> /dev/null; then if ! dpkg -l firmware-atheros &> /dev/null; then
ynh_secure_remove /lib/firmware/htc_7010.fw rm -f /lib/firmware/htc_7010.fw
ynh_secure_remove /lib/firmware/htc_9271.fw rm -f /lib/firmware/htc_9271.fw
fi fi
fi fi
apt-get --assume-yes --force-yes remove ${packages} apt-get --assume-yes --force-yes remove ${packages}
@ -71,4 +71,4 @@ systemctl restart php5-fpm
systemctl reload nginx systemctl reload nginx
# Remove sources # Remove sources
ynh_secure_remove /var/www/wifiadmin/ rm -rf /var/www/wifiadmin/

2
scripts/restore
View file

@ -27,4 +27,4 @@ git --work-tree "${tmpdir}/" --git-dir "${tmpdir}/.git/" reset --hard "${gitcomm
cd "${tmpdir}/scripts/" cd "${tmpdir}/scripts/"
bash ./upgrade bash ./upgrade
ynh_secure_remove "${tmpdir}/" rm -r "${tmpdir}/"