Merge branch 'hotfix-1.9.3' into develop
hotfix-1.9.3
This commit is contained in:
commit
401abf1f4b
@ -1,5 +1,8 @@
|
|||||||
2018-04-26 - 1.9.1
|
2018-04-26 - 1.9.1
|
||||||
* seperate script and config
|
* seperate script and config
|
||||||
|
|
||||||
2018-04-26 - 1.9.2
|
2018-05-10 - 1.9.2
|
||||||
* exec singel func
|
* exec singel func
|
||||||
|
|
||||||
|
2018-05-10 - 1.9.3
|
||||||
|
* hotfix-1.9.3
|
||||||
|
@ -1,12 +1,22 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
[ -f "src/remaster.sh" ] && {
|
version=$1
|
||||||
|
date=`date +%Y-%m-%d`
|
||||||
|
|
||||||
v=`echo $1 | sed 's/\./\\./g'`
|
[ -e "src/remaster.sh" ] && {
|
||||||
|
|
||||||
|
version_sed=`echo $version | sed 's/\./\\./g'`
|
||||||
|
|
||||||
#nummer
|
#nummer
|
||||||
sed -i "s/@version\ .\..\../@version\ $v/g" src/remaster.sh
|
sed -i "s/@version\ .\..\../@version\ $version_sed/g" src/remaster.sh
|
||||||
|
|
||||||
#datum
|
#datum
|
||||||
sed -i "s/@date\ ....-..-../@date\ `date +%Y-%m-%d`/g" src/remaster.sh
|
sed -i "s/@date\ ....-..-../@date\ $date/g" src/remaster.sh
|
||||||
|
}
|
||||||
|
|
||||||
|
[ -e "changes/remaster.md" ] && {
|
||||||
|
|
||||||
|
echo >> changes/remaster.md
|
||||||
|
echo $date - $version >> changes/remaster.md
|
||||||
|
echo pleace update changes/remaster.md
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#@version 1.9.2
|
#@version 1.9.3
|
||||||
#@autor 6543@obermui.de
|
#@autor 6543@obermui.de
|
||||||
#@date 2018-05-10
|
#@date 2018-05-10
|
||||||
#@licence GNUv3
|
#@licence GNUv3
|
||||||
@ -853,7 +853,7 @@ function proxy_enable_desinfect2017() {
|
|||||||
#Sophos
|
#Sophos
|
||||||
if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
|
if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
|
||||||
echo "Sophos: Found"
|
echo "Sophos: Found"
|
||||||
echo "<Source>sophos:</Source><Proxy><Address>http://www-proxy.bybn.de:80</Proxy></Address>" >> "$chroot_dir/opt/sophos-av/etc/savd.cfg"
|
echo "<Source>sophos:</Source><Proxy><Address>http://$proxy_host:$proxy_port</Proxy></Address>" >> "$chroot_dir/opt/sophos-av/etc/savd.cfg"
|
||||||
else
|
else
|
||||||
eco "Sophos: NOT Found"
|
eco "Sophos: NOT Found"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user