mirror of
https://github.com/YunoHost-Apps/hotspot_ynh.git
synced 2024-09-03 19:25:53 +02:00
Revert "now using ynh_secure_remove helper"
This reverts commit e4c80d4c6b
.
This commit is contained in:
parent
e4c80d4c6b
commit
e4ea067b26
3 changed files with 11 additions and 11 deletions
|
@ -29,7 +29,7 @@ function ynh_systemctl()
|
|||
|
||||
# Save and release the lock...
|
||||
cp $LOCKFILE $LOCKFILE.bkp.$$
|
||||
ynh_secure_remove $LOCKFILE
|
||||
rm $LOCKFILE
|
||||
|
||||
# Wait for the end of the action
|
||||
wait $SYSCTLACTION
|
||||
|
|
|
@ -39,18 +39,18 @@ firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree)
|
|||
systemctl stop ynh-hotspot
|
||||
systemctl disable ynh-hotspot
|
||||
yunohost service remove ynh-hotspot
|
||||
ynh_secure_remove /etc/systemd/system/ynh-hotspot.service /usr/local/bin/ynh-hotspot
|
||||
ynh_secure_remove /tmp/.ynh-hotspot-*
|
||||
rm -f /etc/systemd/system/ynh-hotspot.service /usr/local/bin/ynh-hotspot
|
||||
rm -f /tmp/.ynh-hotspot-*
|
||||
|
||||
# Update firewall for DHCP
|
||||
yunohost firewall disallow --ipv6 UDP 547
|
||||
yunohost firewall disallow UDP 67
|
||||
|
||||
# Remove confs
|
||||
ynh_secure_remove /etc/dnsmasq.dhcpd/
|
||||
ynh_secure_remove /etc/hostapd/hostapd.conf{.tpl?,}
|
||||
ynh_secure_remove /etc/nginx/conf.d/${domain}.d/wifiadmin.conf
|
||||
ynh_secure_remove /etc/php5/fpm/pool.d/wifiadmin.conf
|
||||
rm -fr /etc/dnsmasq.dhcpd/
|
||||
rm -f /etc/hostapd/hostapd.conf{.tpl?,}
|
||||
rm -f /etc/nginx/conf.d/${domain}.d/wifiadmin.conf
|
||||
rm -f /etc/php5/fpm/pool.d/wifiadmin.conf
|
||||
|
||||
# Remove packages
|
||||
if [[ $firmware_nonfree == yes ]]; then
|
||||
|
@ -60,8 +60,8 @@ else
|
|||
|
||||
# Remove free firmwares
|
||||
if ! dpkg -l firmware-atheros &> /dev/null; then
|
||||
ynh_secure_remove /lib/firmware/htc_7010.fw
|
||||
ynh_secure_remove /lib/firmware/htc_9271.fw
|
||||
rm -f /lib/firmware/htc_7010.fw
|
||||
rm -f /lib/firmware/htc_9271.fw
|
||||
fi
|
||||
fi
|
||||
apt-get --assume-yes --force-yes remove ${packages}
|
||||
|
@ -71,4 +71,4 @@ systemctl restart php5-fpm
|
|||
systemctl reload nginx
|
||||
|
||||
# Remove sources
|
||||
ynh_secure_remove /var/www/wifiadmin/
|
||||
rm -rf /var/www/wifiadmin/
|
||||
|
|
|
@ -27,4 +27,4 @@ git --work-tree "${tmpdir}/" --git-dir "${tmpdir}/.git/" reset --hard "${gitcomm
|
|||
cd "${tmpdir}/scripts/"
|
||||
bash ./upgrade
|
||||
|
||||
ynh_secure_remove "${tmpdir}/"
|
||||
rm -r "${tmpdir}/"
|
||||
|
|
Loading…
Reference in a new issue