From 2513b645c1eb8c87cbfe900ca5de568affee8d13 Mon Sep 17 00:00:00 2001 From: 6543 Date: Fri, 11 May 2018 00:04:02 +0200 Subject: [PATCH] standalone executable --- src/func/check_dependency | 4 ++-- src/func/check_user | 4 ++-- src/func/chroot_clean | 4 ++-- src/func/chroot_initial | 4 ++-- src/func/chroot_is_mounted | 4 ++-- src/func/chroot_sh | 4 ++-- src/func/chroot_umount | 4 ++-- src/func/error_code | 7 +++++-- src/func/filesystem_extract | 4 ++-- src/func/filesystem_get_type | 4 ++-- src/func/filesystem_pack | 4 ++-- src/func/iso_create | 4 ++-- src/func/iso_extract | 4 ++-- src/func/on_exit | 4 ++-- src/func/workspace_erase | 4 ++-- src/mods/xrdp | 4 ++-- src/proj/debian | 5 ----- src/proj/desinfect.17 | 5 ----- src/proj/ubuntu | 5 ----- src/proj/ubuntu.16.04 | 5 ----- 20 files changed, 35 insertions(+), 52 deletions(-) diff --git a/src/func/check_dependency b/src/func/check_dependency index 53e25a5..9776c5b 100755 --- a/src/func/check_dependency +++ b/src/func/check_dependency @@ -14,7 +14,7 @@ function check_dependency() { return 0 } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + check_dependency $@ } diff --git a/src/func/check_user b/src/func/check_user index e36cd40..a312e2b 100755 --- a/src/func/check_user +++ b/src/func/check_user @@ -11,7 +11,7 @@ function check_user() { } } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + check_user $@ } diff --git a/src/func/chroot_clean b/src/func/chroot_clean index 137d0ed..e266249 100755 --- a/src/func/chroot_clean +++ b/src/func/chroot_clean @@ -16,7 +16,7 @@ function chroot_clean() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + chroot_clean $@ } diff --git a/src/func/chroot_initial b/src/func/chroot_initial index 7977b67..c0086ba 100755 --- a/src/func/chroot_initial +++ b/src/func/chroot_initial @@ -25,7 +25,7 @@ function chroot_initial() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + chroot_initial $@ } diff --git a/src/func/chroot_is_mounted b/src/func/chroot_is_mounted index 067cf31..687b10b 100755 --- a/src/func/chroot_is_mounted +++ b/src/func/chroot_is_mounted @@ -16,7 +16,7 @@ function chroot_is_mounted() { fi } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + chroot_is_mounted $@ } diff --git a/src/func/chroot_sh b/src/func/chroot_sh index 4013e62..5f1bed2 100755 --- a/src/func/chroot_sh +++ b/src/func/chroot_sh @@ -23,7 +23,7 @@ function chroot_sh() { chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; $command" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + chroot_sh $@ } diff --git a/src/func/chroot_umount b/src/func/chroot_umount index 2790866..31df3ea 100755 --- a/src/func/chroot_umount +++ b/src/func/chroot_umount @@ -25,7 +25,7 @@ function chroot_umount() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + chroot_umount $@ } diff --git a/src/func/error_code b/src/func/error_code index b1c5668..49eaf3a 100755 --- a/src/func/error_code +++ b/src/func/error_code @@ -53,13 +53,16 @@ function error_code() { 22) echo "wrong filesystem" ;; + all) + error_code + ;; *) echo $'No Defined Error Code.\nPerhaps an Error ocure on a Command wich was started by this Skritp.' ;; esac } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + error_code $@ } diff --git a/src/func/filesystem_extract b/src/func/filesystem_extract index a4f52c0..2ca5bdb 100755 --- a/src/func/filesystem_extract +++ b/src/func/filesystem_extract @@ -42,7 +42,7 @@ function filesystem_extract() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + filesystem_extract $@ } diff --git a/src/func/filesystem_get_type b/src/func/filesystem_get_type index fa0e22f..d005f0c 100755 --- a/src/func/filesystem_get_type +++ b/src/func/filesystem_get_type @@ -9,7 +9,7 @@ function filesystem_get_type() { echo ${fs_aTemp[9]} } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + filesystem_get_type $@ } diff --git a/src/func/filesystem_pack b/src/func/filesystem_pack index c5a0a8d..6a89988 100755 --- a/src/func/filesystem_pack +++ b/src/func/filesystem_pack @@ -31,7 +31,7 @@ function filesystem_pack() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + filesystem_pack $@ } diff --git a/src/func/iso_create b/src/func/iso_create index 113d756..a575414 100755 --- a/src/func/iso_create +++ b/src/func/iso_create @@ -25,7 +25,7 @@ function iso_create() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + iso_create $@ } diff --git a/src/func/iso_extract b/src/func/iso_extract index 8912116..ab6c6df 100755 --- a/src/func/iso_extract +++ b/src/func/iso_extract @@ -46,7 +46,7 @@ function iso_extract() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + iso_extract $@ } diff --git a/src/func/on_exit b/src/func/on_exit index cbf1c9f..0801b75 100755 --- a/src/func/on_exit +++ b/src/func/on_exit @@ -28,7 +28,7 @@ function on_exit() { exit $1 } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + on_exit $@ } diff --git a/src/func/workspace_erase b/src/func/workspace_erase index 7c26469..998390c 100755 --- a/src/func/workspace_erase +++ b/src/func/workspace_erase @@ -13,7 +13,7 @@ function workspace_erase() { echo "done" } +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + workspace_erase $@ } diff --git a/src/mods/xrdp b/src/mods/xrdp index 6c47b6e..209fffe 100755 --- a/src/mods/xrdp +++ b/src/mods/xrdp @@ -10,7 +10,7 @@ +#this func is standalone executable [ -n "$1" ] && { - echo param - $1 + xrdp $@ } diff --git a/src/proj/debian b/src/proj/debian index 25f461e..db0aaa4 100755 --- a/src/proj/debian +++ b/src/proj/debian @@ -35,8 +35,3 @@ function os_update() { echo "done" } - -[ -n "$1" ] && { - echo param - $1 -} diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17 index 48140f3..eedc2ce 100755 --- a/src/proj/desinfect.17 +++ b/src/proj/desinfect.17 @@ -7,8 +7,3 @@ source /proj/ubuntu.16.04 TEST2="na" - -[ -n "$1" ] && { - echo param - $1 -} diff --git a/src/proj/ubuntu b/src/proj/ubuntu index 180485c..cd36ae9 100755 --- a/src/proj/ubuntu +++ b/src/proj/ubuntu @@ -7,8 +7,3 @@ #################################### # . -> debian source /proj/debian - -[ -n "$1" ] && { - echo param - $1 -} diff --git a/src/proj/ubuntu.16.04 b/src/proj/ubuntu.16.04 index cc7275a..427a76a 100755 --- a/src/proj/ubuntu.16.04 +++ b/src/proj/ubuntu.16.04 @@ -5,8 +5,3 @@ #ubuntu.16.04 # . -> ubuntu -> debian source /proj/ubuntu - -[ -n "$1" ] && { - echo param - $1 -}