From 6616478014de7a23021252974f8063344218e8c3 Mon Sep 17 00:00:00 2001 From: 6543 Date: Mon, 7 May 2018 01:49:19 +0200 Subject: [PATCH] source cant use variables (p4) --- src/func/check_dependency | 3 +-- src/func/check_user | 3 +-- src/func/chroot_clean | 3 +-- src/func/chroot_initial | 3 +-- src/func/chroot_is_mounted | 3 +-- src/func/chroot_sh | 3 +-- src/func/chroot_umount | 3 +-- src/func/error_code | 3 +-- src/func/filesystem_extract | 3 +-- src/func/filesystem_get_type | 3 +-- src/func/filesystem_pack | 3 +-- src/func/iso_create | 3 +-- src/func/iso_extract | 3 +-- src/func/on_exit | 3 +-- src/func/workspace_erase | 3 +-- src/proj/debian | 3 +-- src/proj/desinfect.17 | 5 ++--- src/proj/ubuntu | 5 ++--- src/proj/ubuntu.16.04 | 5 ++--- 19 files changed, 22 insertions(+), 41 deletions(-) diff --git a/src/func/check_dependency b/src/func/check_dependency index 06b1c4f..415ce16 100644 --- a/src/func/check_dependency +++ b/src/func/check_dependency @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #check_dependency # -> 0 | -> 16 diff --git a/src/func/check_user b/src/func/check_user index 7810111..534335a 100644 --- a/src/func/check_user +++ b/src/func/check_user @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #check_user function check_user() { diff --git a/src/func/chroot_clean b/src/func/chroot_clean index 485b8e0..e174124 100644 --- a/src/func/chroot_clean +++ b/src/func/chroot_clean @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #chroot_clean [chroot_dir] function chroot_clean() { diff --git a/src/func/chroot_initial b/src/func/chroot_initial index d4f9564..12eb26e 100644 --- a/src/func/chroot_initial +++ b/src/func/chroot_initial @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #chroot_initial [chroot_dir] function chroot_initial() { diff --git a/src/func/chroot_is_mounted b/src/func/chroot_is_mounted index f5facc3..f403cc9 100644 --- a/src/func/chroot_is_mounted +++ b/src/func/chroot_is_mounted @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #chroot_is_mounted [chroot_dir] #(Boolean)-> true | false diff --git a/src/func/chroot_sh b/src/func/chroot_sh index b475716..c0ac17a 100644 --- a/src/func/chroot_sh +++ b/src/func/chroot_sh @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #chroot_sh [chroot_dir] [command] function chroot_sh() { diff --git a/src/func/chroot_umount b/src/func/chroot_umount index 1bfd582..c1614b7 100644 --- a/src/func/chroot_umount +++ b/src/func/chroot_umount @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #chroot_umount [chroot_dir] function chroot_umount() { diff --git a/src/func/error_code b/src/func/error_code index 57a4a15..3154323 100644 --- a/src/func/error_code +++ b/src/func/error_code @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #error_code [error_level] function error_code() { diff --git a/src/func/filesystem_extract b/src/func/filesystem_extract index ed448d8..c7e0855 100644 --- a/src/func/filesystem_extract +++ b/src/func/filesystem_extract @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #filesystem_extract [filesystem_img_source] [chroot_path] function filesystem_extract() { diff --git a/src/func/filesystem_get_type b/src/func/filesystem_get_type index 1bffba9..9056936 100644 --- a/src/func/filesystem_get_type +++ b/src/func/filesystem_get_type @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #filesystem_get_type [dir] #(String)-> ext4, ext2, btfs, fuse, ... diff --git a/src/func/filesystem_pack b/src/func/filesystem_pack index a542012..3cc9a7a 100644 --- a/src/func/filesystem_pack +++ b/src/func/filesystem_pack @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #filesystem_pack [chroot_path] [filesystem_img_destination] function filesystem_pack() { diff --git a/src/func/iso_create b/src/func/iso_create index d6087f4..dc19bf0 100644 --- a/src/func/iso_create +++ b/src/func/iso_create @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #iso_create [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable] function iso_create() { diff --git a/src/func/iso_extract b/src/func/iso_extract index 122ad6d..dd9f00f 100644 --- a/src/func/iso_extract +++ b/src/func/iso_extract @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #iso_extract [iso_source] [iso_extr_dir] function iso_extract() { diff --git a/src/func/on_exit b/src/func/on_exit index 40b6f34..1bc4e23 100644 --- a/src/func/on_exit +++ b/src/func/on_exit @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #on_exit [error_level] function on_exit() { diff --git a/src/func/workspace_erase b/src/func/workspace_erase index 2ecb36e..fb3842a 100644 --- a/src/func/workspace_erase +++ b/src/func/workspace_erase @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #workspace_erase [workspace_path] function workspace_erase() { diff --git a/src/proj/debian b/src/proj/debian index d19c8e8..a565d23 100644 --- a/src/proj/debian +++ b/src/proj/debian @@ -1,7 +1,6 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #################################### ##### Base Template D E B I A N #### #################################### diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17 index e3c35f4..64a4454 100644 --- a/src/proj/desinfect.17 +++ b/src/proj/desinfect.17 @@ -1,10 +1,9 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #desinfect.17 # . -Y ubuntu.16.04 -> ubuntu -> debian -source $LIBDIR/proj/ubuntu.16.04 +source /proj/ubuntu.16.04 TEST2="na" diff --git a/src/proj/ubuntu b/src/proj/ubuntu index 02653d2..ce9c72c 100644 --- a/src/proj/ubuntu +++ b/src/proj/ubuntu @@ -1,12 +1,11 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #################################### ##### Base Template U B U N T U #### #################################### # . -> debian -source $LIBDIR/proj/debian +source /proj/debian TEST2="jaUb" diff --git a/src/proj/ubuntu.16.04 b/src/proj/ubuntu.16.04 index 5619a3f..43135c9 100644 --- a/src/proj/ubuntu.16.04 +++ b/src/proj/ubuntu.16.04 @@ -1,10 +1,9 @@ #!/bin/bash #remaster lib -[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +[ -d ""] || { echo "LIBDIR not exist"; exit 1; } #ubuntu.16.04 # . -> ubuntu -> debian -source $LIBDIR/proj/ubuntu +source /proj/ubuntu TEST2="jaUBU"