free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename variable

This commit is contained in:
Bob Mottram 2016-11-01 10:09:07 +00:00
parent d116a6081c
commit e5248e8ddb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freedombone-app-pihole
View File

@ -41,7 +41,7 @@ PIHOLE_DNS2='213.73.91.35'
piholeBasename=pihole piholeBasename=pihole
piholeDir=/etc/$piholeBasename piholeDir=/etc/$piholeBasename
PIHOLE_ADLIST=$piholeDir/adlists.list PIHOLE_CUSTOM_ADLIST=$piholeDir/adlists.list
PIHOLE_BLACKLIST=$piholeDir/blacklist.txt PIHOLE_BLACKLIST=$piholeDir/blacklist.txt
PIHOLE_WHITELIST=$piholeDir/whitelist.txt PIHOLE_WHITELIST=$piholeDir/whitelist.txt
@ -59,7 +59,9 @@ function pihole_copy_files {
fi fi
cp $INSTALL_DIR/pihole/adlists.default /etc/.pihole/adlists.default cp $INSTALL_DIR/pihole/adlists.default /etc/.pihole/adlists.default
cp $INSTALL_DIR/pihole/adlists.default $piholeDir/adlists.default cp $INSTALL_DIR/pihole/adlists.default $piholeDir/adlists.default
cp $INSTALL_DIR/pihole/adlists.default $PIHOLE_ADLIST if [ ! -f $PIHOLE_CUSTOM_ADLIST ]; then
cp $INSTALL_DIR/pihole/adlists.default $PIHOLE_CUSTOM_ADLIST
fi
cp $INSTALL_DIR/pihole/advanced/Scripts/* /opt/$piholeBasename cp $INSTALL_DIR/pihole/advanced/Scripts/* /opt/$piholeBasename
if [ -f /etc/dnsmasq.d/01-pihole.conf ]; then if [ -f /etc/dnsmasq.d/01-pihole.conf ]; then
rm /etc/dnsmasq.d/01-pihole.conf rm /etc/dnsmasq.d/01-pihole.conf
@ -239,7 +241,7 @@ function configure_interactive_pihole {
255) exit 1;; 255) exit 1;;
esac esac
case $(cat $data) in case $(cat $data) in
1) editor $PIHOLE_ADLIST 1) editor $PIHOLE_CUSTOM_ADLIST
update_pihole_interactive update_pihole_interactive
;; ;;
2) editor $PIHOLE_BLACKLIST 2) editor $PIHOLE_BLACKLIST