Browse Source

Merge branch 'hotfix-1.9.3' into feature-lxc

hotfix-1.9.3
feature-lxc
6543 4 years ago
parent
commit
edfeec5868
  1. 5
      changes/remaster.md
  2. 18
      script/set_version.sh
  3. 8
      src/remaster.sh

5
changes/remaster.md

@ -1,5 +1,8 @@
2018-04-26 - 1.9.1
* seperate script and config

2018-04-26 - 1.9.2
2018-05-10 - 1.9.2
* exec singel func

2018-05-10 - 1.9.3
* hotfix-1.9.3

18
script/set_version.sh

@ -1,12 +1,22 @@
#!/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
sed -i "s/@version\ .\..\../@version\ $v/g" src/remaster.sh
sed -i "s/@version\ .\..\../@version\ $version_sed/g" src/remaster.sh

#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
}

8
src/remaster.sh

@ -1,5 +1,5 @@
#!/bin/bash
#@version 1.9.2
#@version 1.9.3
#@autor 6543@obermui.de
#@date 2018-05-10
#@licence GNUv3
@ -15,10 +15,10 @@
}

#read main setting
if [ -f "<ROOTDIR>/etc/remaster/config.cfg"]; then
if [ -f "<ROOTDIR>/etc/remaster/config.cfg" ]; then
source "<ROOTDIR>/etc/remaster/config.cfg"
else
if [ -f "<ROOTDIR>/etc/remaster/config.sample.cfg"]; then
if [ -f "<ROOTDIR>/etc/remaster/config.sample.cfg" ]; then
source "<ROOTDIR>/etc/remaster/config.sample.cfg"
else
echo "ERROR config not found"
@ -868,7 +868,7 @@ function proxy_enable_desinfect2017() {
#Sophos
if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
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
eco "Sophos: NOT Found"
fi

Loading…
Cancel
Save