diff --git a/autogen.sh b/autogen.sh index 30fe4ad..181dc9a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,14 +1,18 @@ #!/bin/bash # at the moment only generate dir structure in /build -##################### -## setup build dir ## -##################### +#################### +## set enviroment ## +#################### -rootdir=build +[ -n "$1" ] && mode=debug +# install | clean | debug + +case +ROOTDIR=build echo "clear build" -[ -d $rootdir ] && rm -v -R $rootdir -mkdir $rootdir +[ -d $ROOTDIR ] && rm -v -R $ROOTDIR +mkdir $ROOTDIR ###################### ## skripte copieren ## @@ -17,20 +21,20 @@ mkdir $rootdir echo "copy files" # remaster -mkdir -p $rootdir/usr/bin/ -cp -v src/remaster.sh $rootdir/usr/bin/remaster -chmod +x $rootdir/usr/bin/remaster +mkdir -p $ROOTDIR/usr/bin/ +cp -v src/remaster.sh $ROOTDIR/usr/bin/remaster +chmod +x $ROOTDIR/usr/bin/remaster # modules -mkdir -p $rootdir/usr/lib/remaster/ +mkdir -p $ROOTDIR/usr/lib/remaster/ for i in proj func mods; do - mkdir -p $rootdir/usr/lib/remaster/$i - cp -v src/$i/* $rootdir/usr/lib/remaster/$i/ + mkdir -p $ROOTDIR/usr/lib/remaster/$i + cp -v src/$i/* $ROOTDIR/usr/lib/remaster/$i/ done # setting -mkdir -p $rootdir/etc/remaster/ -cp -v src/config.sample.cfg $rootdir/etc/remaster/config.sample.cfg +mkdir -p $ROOTDIR/etc/remaster/ +cp -v src/config.sample.cfg $ROOTDIR/etc/remaster/config.sample.cfg # Pfade anpassen @@ -39,3 +43,19 @@ cp -v src/config.sample.cfg $rootdir/etc/remaster/config.sample.cfg #mkdeb... #not jet + + +case "$1" in + install) + install || exit 1 + ;; + clean) + clean || exit 1 + ;; + debug) + debug || exit 1 + ;; + *) + echo "Usage: install | clean | debug" + exit 1 +esac diff --git a/doc/buid_vars.md b/doc/buid_vars.md new file mode 100644 index 0000000..f9900cc --- /dev/null +++ b/doc/buid_vars.md @@ -0,0 +1,12 @@ +variablen, welche um zu funktionieren mit statischen pfaden +ausgetauscht werden müssen: + +remaster.sh + * + -(install)> "" + -(debug)> 'pwd'/build + +remaster.sh; /*/*; + * + -(install)> /usr/lib/remaster + -(debug)> 'pwd'/build/usr/lib/remaster diff --git a/src/func/check_dependency b/src/func/check_dependency index f4d773c..06b1c4f 100644 --- a/src/func/check_dependency +++ b/src/func/check_dependency @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } #check_dependency # -> 0 | -> 16 diff --git a/src/func/check_user b/src/func/check_user index e12019a..7810111 100644 --- a/src/func/check_user +++ b/src/func/check_user @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } #check_user function check_user() { diff --git a/src/func/chroot_clean b/src/func/chroot_clean index 1ea9543..485b8e0 100644 --- a/src/func/chroot_clean +++ b/src/func/chroot_clean @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 c341464..d4f9564 100644 --- a/src/func/chroot_initial +++ b/src/func/chroot_initial @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 8f46f45..f5facc3 100644 --- a/src/func/chroot_is_mounted +++ b/src/func/chroot_is_mounted @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 9055051..b475716 100644 --- a/src/func/chroot_sh +++ b/src/func/chroot_sh @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 613998b..1bfd582 100644 --- a/src/func/chroot_umount +++ b/src/func/chroot_umount @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 a150e8b..57a4a15 100644 --- a/src/func/error_code +++ b/src/func/error_code @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 9c86de2..ed448d8 100644 --- a/src/func/filesystem_extract +++ b/src/func/filesystem_extract @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 927ee8f..1bffba9 100644 --- a/src/func/filesystem_get_type +++ b/src/func/filesystem_get_type @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 884498e..a542012 100644 --- a/src/func/filesystem_pack +++ b/src/func/filesystem_pack @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 ba58400..d6087f4 100644 --- a/src/func/iso_create +++ b/src/func/iso_create @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 3d6dd75..122ad6d 100644 --- a/src/func/iso_extract +++ b/src/func/iso_extract @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 9c2bcb6..40b6f34 100644 --- a/src/func/on_exit +++ b/src/func/on_exit @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { 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 004f8b5..2ecb36e 100644 --- a/src/func/workspace_erase +++ b/src/func/workspace_erase @@ -1,7 +1,7 @@ #!/bin/bash #remaster lib -[ -d "$LIBDR"] || export LIBDIR="/usr/lib/remaster/" -[ -d "$LIBDR"] || { echo "LIBDR not exist"; exit 1; } +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } #workspace_erase [workspace_path] function workspace_erase() { diff --git a/src/proj/debian b/src/proj/debian new file mode 100644 index 0000000..d19c8e8 --- /dev/null +++ b/src/proj/debian @@ -0,0 +1,40 @@ +#!/bin/bash +#remaster lib +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } +#################################### +##### Base Template D E B I A N #### +#################################### +# . + + +#tools_add [chroot_dir] [tools_list] +function tools_add() { + echo "add tools ... " + #$1 = chroot directory + chroot_dir="$1" + tools_list="$2" + + chroot "$chroot_dir" /bin/bash -c "apt-get update" > /dev/null + [ "$?" == "0" ] && echo "apt-get update: success" + chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:" + echo "done" +} + +#os_update [chroot_dir] +function os_update() { + echo "updating os ... " + #$1 = chroot directory + + chroot_dir="$1" + + chroot "$chroot_dir" /bin/bash -c "apt-get update" > /dev/null + [ "$?" == "0" ] && echo "apt-get update: success" + chroot "$chroot_dir" /bin/bash -c "apt-get dist-upgrade -y" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:" + chroot "$chroot_dir" /bin/bash -c "apt-get clean" + + echo "done" +} + +TEST="ja" +TEST2="ja" diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17 new file mode 100644 index 0000000..e3c35f4 --- /dev/null +++ b/src/proj/desinfect.17 @@ -0,0 +1,10 @@ +#!/bin/bash +#remaster lib +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } + +#desinfect.17 +# . -Y ubuntu.16.04 -> ubuntu -> debian +source $LIBDIR/proj/ubuntu.16.04 + +TEST2="na" diff --git a/src/proj/desinfect17 b/src/proj/desinfect17 deleted file mode 100644 index e69de29..0000000 diff --git a/src/proj/ubuntu b/src/proj/ubuntu new file mode 100644 index 0000000..02653d2 --- /dev/null +++ b/src/proj/ubuntu @@ -0,0 +1,12 @@ +#!/bin/bash +#remaster lib +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } + +#################################### +##### Base Template U B U N T U #### +#################################### +# . -> debian +source $LIBDIR/proj/debian + +TEST2="jaUb" diff --git a/src/proj/ubuntu.16.04 b/src/proj/ubuntu.16.04 index e69de29..5619a3f 100644 --- a/src/proj/ubuntu.16.04 +++ b/src/proj/ubuntu.16.04 @@ -0,0 +1,10 @@ +#!/bin/bash +#remaster lib +[ -d "$LIBDIR"] || export LIBDIR="/usr/lib/remaster/" +[ -d "$LIBDIR"] || { echo "LIBDIR not exist"; exit 1; } + +#ubuntu.16.04 +# . -> ubuntu -> debian +source $LIBDIR/proj/ubuntu + +TEST2="jaUBU" diff --git a/src/remaster.sh b/src/remaster.sh index a711897..146190b 100755 --- a/src/remaster.sh +++ b/src/remaster.sh @@ -7,25 +7,19 @@ ##################################################################################### ################## S e t t i n g s ################################################## ##################################################################################### -#get base dir -rootdir=`echo $0 | rev | cut -d "/" -f 2- | rev`/../../ -export "rootdir=`readlink -e $rootdir`" #set functions -if [ -p "$rootdir/usr/lib/remaster/" ]; then - #source "$rootdir/usr/lib/remaster/" ... - export LIBDIR="$rootdir/usr/lib/remaster/" -else +[ -d "" ] || { echo "ERROR functions not found" exit 1 -fi +} #read main setting -if [ -f "$rootdir/etc/remaster/config.cfg"]; then - source "$rootdir/etc/remaster/config.cfg" +if [ -f "/etc/remaster/config.cfg"]; then + source "/etc/remaster/config.cfg" else - if [ -f "$rootdir/etc/remaster/config.sample.cfg"]; then - source "$rootdir/etc/remaster/config.sample.cfg" + if [ -f "/etc/remaster/config.sample.cfg"]; then + source "/etc/remaster/config.sample.cfg" else echo "ERROR config not found" exit 1 @@ -483,44 +477,44 @@ function main_update() { ### Error Handlings ### #on_exit [error_level] -source $LIBDR/func/on_exit +source /func/on_exit #error_code [error_level] -source $LIBDR/func/error_code +source /func/error_code #check_user -source $LIBDR/func/check_user +source /func/check_user #check_dependency # -> 0 | -> 16 -source $LIBDR/func/check_dependency +source /func/check_dependency ### Workspace ### #workspace_erase [workspace_path] -source $LIBDR/func/workspace_erase +source /func/workspace_erase ### Filesystem ### #filesystem_extract [filesystem_img_source] [chroot_path] -source $LIBDR/func/filesystem_extract +source /func/filesystem_extract #filesystem_pack [chroot_path] [filesystem_img_destination] -source $LIBDR/func/filesystem_pack +source /func/filesystem_pack #filesystem_get_type [dir] #(String)-> ext4, ext2, btfs, fuse, ... -source $LIBDR/func/filesystem_get_type +source /func/filesystem_get_type ### ISO ### #iso_extract [iso_source] [iso_extr_dir] -source $LIBDR/func/iso_extract +source /func/iso_extract #iso_create [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable] -source $LIBDR/func/iso_create +source /func/iso_create #iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable] function iso_create_desinfect2015() { @@ -573,7 +567,7 @@ function iso_create_desinfect2017() { ### chroot ### #chroot_initial [chroot_dir] -source $LIBDR/func/chroot_initial +source /func/chroot_initial #chroot_initial_desinfect2015 [chroot_dir] function chroot_initial_desinfect2015() { @@ -629,10 +623,10 @@ function chroot_initial_desinfect2017() { #chroot_clean [chroot_dir] -source $LIBDR/func/chroot_clean +source /func/chroot_clean #chroot_umount [chroot_dir] -source $LIBDR/func/chroot_umount +source /func/chroot_umount #chroot_umount_desinfect2015 [chroot_dir] function chroot_umount_desinfect2015() { @@ -689,10 +683,10 @@ function chroot_umount_desinfect2017() { #chroot_is_mounted [chroot_dir] #(Boolean)-> true | false -source $LIBDR/func/chroot_is_mounted +source /func/chroot_is_mounted #chroot_sh [chroot_dir] [command] -source $LIBDR/func/chroot_sh +source /func/chroot_sh ### Settings ### ### proxy @@ -1100,19 +1094,7 @@ function sourcelist_desinfect_set_extendet2017() { ### Update ### #os_update [chroot_dir] -function os_update() { - echo "updating os ... " - #$1 = chroot directory - - chroot_dir="$1" - - chroot "$chroot_dir" /bin/bash -c "apt-get update" > /dev/null - [ "$?" == "0" ] && echo "apt-get update: success" - chroot "$chroot_dir" /bin/bash -c "apt-get dist-upgrade -y" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:" - chroot "$chroot_dir" /bin/bash -c "apt-get clean" - - echo "done" -} +#-> proj/debian #os_update_desinfect2015 [chroot_dir] function os_update_desinfect2015() { @@ -1332,17 +1314,7 @@ function os_update_desinfect2017() { ### Tools ### #tools_add [chroot_dir] [tools_list] -function tools_add() { - echo "add tools ... " - #$1 = chroot directory - chroot_dir="$1" - tools_list="$2" - - chroot "$chroot_dir" /bin/bash -c "apt-get update" > /dev/null - [ "$?" == "0" ] && echo "apt-get update: success" - chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:" - echo "done" -} +#-> proj/debian #tools_add_desinfect2015 [chroot_dir] [tools_list] function tools_add_desinfect2015() { @@ -1377,6 +1349,7 @@ function tools_add_desinfect2017() { sourcelist_desinfect_set_nomal2017 "$chroot_dir" } +source /proj/desinfect.17 ### Handle Parameters & Modes ###