overlod functions...

This commit is contained in:
6543 2018-05-22 00:58:05 +02:00
parent 2752dcc5ca
commit 32d09b764b
2 changed files with 44 additions and 52 deletions

View File

@ -9,8 +9,8 @@ project_relation="desinfect.15 $project_relation"






#iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable] #iso_create-desinfect.15 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
function iso_create_desinfect2015() { function iso_create-desinfect.15() {
echo "prepere iso folder ... " echo "prepere iso folder ... "


chroot_path="$1" chroot_path="$1"
@ -24,14 +24,15 @@ function iso_create_desinfect2015() {


echo "done" echo "done"


iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" iso_create-debian "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
} }
function iso_create() { iso_create-desinfect.15 $@ }


#chroot_initial_desinfect2015 [chroot_dir] #chroot_initial-desinfect.15 [chroot_dir]
function chroot_initial_desinfect2015() { function chroot_initial-desinfect.15() {
#$1 = chroot dir #$1 = chroot dir


chroot_initial "$1" chroot_initial-debian "$1"


echo -n "initial desinfect on chroot ... " echo -n "initial desinfect on chroot ... "


@ -49,11 +50,12 @@ function chroot_initial_desinfect2015() {


echo "done" echo "done"
} }
function iso_create() { iso_create-desinfect.15 $@ }


#chroot_umount_desinfect2015 [chroot_dir] #chroot_umount-desinfect.15 [chroot_dir]
function chroot_umount_desinfect2015() { function chroot_umount-desinfect.15() {
#call main mount #call main mount
chroot_umount "$1" chroot_umount-debian "$1"


echo -n "unmount desinfect on chroot ... " echo -n "unmount desinfect on chroot ... "
#check chroot dir #check chroot dir
@ -74,11 +76,12 @@ function chroot_umount_desinfect2015() {


echo "done" echo "done"
} }
function chroot_umount() { chroot_umount-desinfect.15 $@ }


#proxy_enable_desinfect2015 [chroot_dir] [proxy_host] [proxy_port] #proxy_enable-desinfect.15 [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable_desinfect2015() { function proxy_enable-desinfect.15() {


proxy_enable $1 $2 $3 proxy_enable-debian $1 $2 $3


echo -n "enable proxy for desinfect's av ... " echo -n "enable proxy for desinfect's av ... "


@ -105,6 +108,7 @@ function proxy_enable_desinfect2015() {


echo "done" echo "done"
} }
function proxy_enable() { proxy_enable-desinfect.15 $@ }


#sourcelist_desinfect_set_nomal2015 [chroot_dir] #sourcelist_desinfect_set_nomal2015 [chroot_dir]
function sourcelist_desinfect_set_nomal2015() { function sourcelist_desinfect_set_nomal2015() {
@ -173,14 +177,14 @@ function sourcelist_desinfect_set_extendet2015() {
echo "done" echo "done"
} }


#os_update_desinfect2015 [chroot_dir] #os_update-desinfect.15 [chroot_dir]
function os_update_desinfect2015() { function os_update-desinfect.15() {
#$1 = chroot directory #$1 = chroot directory


chroot_dir="$1" chroot_dir="$1"


#call main os_update #call main os_update
os_update "$chroot_dir" os_update-debian "$chroot_dir"


echo "update virus definitions ... " echo "update virus definitions ... "


@ -208,14 +212,16 @@ function os_update_desinfect2015() {


echo "done" echo "done"
} }
function os_update() { os_update-desinfect.15 $@ }


#tools_add_desinfect2015 [chroot_dir] [tools_list] #tools_add-desinfect.15 [chroot_dir] [tools_list]
function tools_add_desinfect2015() { function tools_add-desinfect.15() {
#$1 = chroot directory #$1 = chroot directory
chroot_dir="$1" chroot_dir="$1"
tools_list="$2" tools_list="$2"


sourcelist_desinfect_set_extendet2015 "$chroot_dir" sourcelist_desinfect_set_extendet2015 "$chroot_dir"
tools_add "$chroot_dir" "$tools_list" tools_add-debian "$chroot_dir" "$tools_list"
sourcelist_desinfect_set_nomal2015 "$chroot_dir" sourcelist_desinfect_set_nomal2015 "$chroot_dir"
} }
function tools_add() { tools_add-desinfect.15 $@ }

View File

@ -8,30 +8,11 @@ source <LIBDIR>/proj/ubuntu.14.04
project_relation="desinfect.16 $project_relation" project_relation="desinfect.16 $project_relation"





#chroot_initial-desinfect.16 [chroot_dir]
#iso_create_desinfect2016 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable] function chroot_initial-desinfect.16() {
function iso_create_desinfect2016() {
#echo "prepere iso folder ... "

chroot_path="$1"
iso_extr_dir="$2"
iso_aim="$3"
iso_lable="$4"

#desinfect
#rm "$iso_extr_dir/casper/initrd.lz"
#wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"

#echo "done"

iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
}

#chroot_initial_desinfect2016 [chroot_dir]
function chroot_initial_desinfect2016() {
#$1 = chroot dir #$1 = chroot dir


chroot_initial "$1" chroot_initial-debian "$1"


echo -n "initial desinfect on chroot ... " echo -n "initial desinfect on chroot ... "


@ -47,11 +28,12 @@ function chroot_initial_desinfect2016() {


echo "done" echo "done"
} }
function chroot_initial() { chroot_initial-desinfect.16 $@ }


#chroot_umount_desinfect2016 [chroot_dir] #chroot_umount-desinfect.16 [chroot_dir]
function chroot_umount_desinfect2016() { function chroot_umount-desinfect.16() {
#call main mount #call main mount
chroot_umount "$1" chroot_umount-debian "$1"


echo -n "unmount desinfect on chroot ... " echo -n "unmount desinfect on chroot ... "
#check chroot dir #check chroot dir
@ -69,11 +51,12 @@ function chroot_umount_desinfect2016() {


echo "done" echo "done"
} }
function chroot_umount() { chroot_umount-desinfect.16 $@ }


#proxy_enable_desinfect2016 [chroot_dir] [proxy_host] [proxy_port] #proxy_enable-desinfect.16 [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable_desinfect2016() { function proxy_enable-desinfect.16() {


proxy_enable $1 $2 $3 proxy_enable-debian $1 $2 $3


echo -n "enable proxy for desinfect's av ... " echo -n "enable proxy for desinfect's av ... "


@ -112,6 +95,7 @@ function proxy_enable_desinfect2016() {


echo "done" echo "done"
} }
function proxy_enable() { proxy_enable-desinfect.16 $@ }


#sourcelist_desinfect_set_nomal2016 [chroot_dir] #sourcelist_desinfect_set_nomal2016 [chroot_dir]
function sourcelist_desinfect_set_nomal2016() { function sourcelist_desinfect_set_nomal2016() {
@ -180,14 +164,14 @@ function sourcelist_desinfect_set_extendet2016() {
echo "done" echo "done"
} }


#os_update_desinfect2016 [chroot_dir] #os_update-desinfect.16 [chroot_dir]
function os_update_desinfect2016() { function os_update-desinfect.16() {
#$1 = chroot directory #$1 = chroot directory


chroot_dir="$1" chroot_dir="$1"


#call main os_update #call main os_update
os_update "$chroot_dir" os_update-debian "$chroot_dir"


echo "update virus definitions ... " echo "update virus definitions ... "


@ -263,14 +247,16 @@ function os_update_desinfect2016() {


echo "update virus definitions done" echo "update virus definitions done"
} }
function os_update() { os_update-desinfect.16 $@ }


#tools_add_desinfect2016 [chroot_dir] [tools_list] #tools_add-desinfect.16 [chroot_dir] [tools_list]
function tools_add_desinfect2016() { function tools_add-desinfect.16() {
#$1 = chroot directory #$1 = chroot directory
chroot_dir="$1" chroot_dir="$1"
tools_list="$2" tools_list="$2"


sourcelist_desinfect_set_extendet2016 "$chroot_dir" sourcelist_desinfect_set_extendet2016 "$chroot_dir"
tools_add "$chroot_dir" "$tools_list" tools_add-debian "$chroot_dir" "$tools_list"
sourcelist_desinfect_set_nomal2016 "$chroot_dir" sourcelist_desinfect_set_nomal2016 "$chroot_dir"
} }
function tools_add() { tools_add-desinfect.16 $@ }