clean up

checkout Changelog

.gitignore

@@ -1 +1,2 @@
 /build
+/release

Changelog.md

@@ -0,0 +1,42 @@
+2018-04-26 - 1.9.1
+ * seperate script and config
+
+2018-05-10 - 1.9.2
+ * exec singel func
+
+2018-05-10 - 1.9.3
+ * hotfix-1.9.3
+
+2018-05-12 - 2.0.0
+ * add feature build debian packages
+ * add Doc "Server Bedienung"
+ * split functions
+ * separate config into /etc/remaster/
+
+2018-05-13 - 2.0.1
+ * Update-Prüfmechanismus #15
+
+2018-05-13 - 2.0.2
+ * hotfix-2.0.2 ( create release folder if not exist )
+
+2018-05-20 - 2.0.3
+ * make email, proxy optional
+ * change Strukture.md
+ * add config check
+ * some help scripts
+
+2018-05-22 - 2.0.4
+ * add iso_source as URL
+ * restructure code
+ * use proj templates
+ * some help scripts
+
+2019-09-20 - 2.1.0
+ * fixes
+  - filesystem_extract: filesystem_get_type
+  - update dev scripts
+  - work without arguments
+ * check_update: acuret message
+ * restruct sample config
+ * add "Help & Info" menue/section (#24) (#20)
+ * --config | custom config (#25)

DEBIAN/conffiles

@@ -0,0 +1 @@
+/etc/remaster/config.sample.cfg

DEBIAN/control

@@ -0,0 +1,12 @@
+Package: remaster
+Source: remaster
+Version: 2.1.0
+Architecture: all
+Maintainer: 6543 <6543@obermui.de>
+Installed-Size: <SIZE>
+Depends: squashfs-tools, xorriso, wget, sed (>= 4.2), sendemail, bash (>= 4.3)
+Suggests: nfs-kernel-server, isc-dhcp-server
+Section: utils
+Priority: optional
+Homepage: https://github.com/6543/remaster
+Description: The aim of this Project is to create a daemon for a server, witch update live systems.

DEBIAN/postinst

@@ -0,0 +1 @@
+#!/bin/sh

DEBIAN/postrm

@@ -0,0 +1 @@
+#!/bin/sh

DEBIAN/preinst

@@ -0,0 +1 @@
+#!/bin/sh

DEBIAN/prerm

@@ -0,0 +1 @@
+#!/bin/sh

README.md

@@ -1,5 +1,9 @@
-# remaster
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://code.obermui.de/api/v1/repos/6543/remaster/releases&query=$[0].tag_name)](https://code.obermui.de/6543/remaster/releases)
+[![PGP Sig](https://img.shields.io/keybase/pgp/6543)](https://mh.obermui.de/publickey.gpg)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2F6543%2Fremaster.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2F6543%2Fremaster?ref=badge_shield)
 
+# remaster
 
 ## Description
 
@@ -12,6 +16,7 @@ The aim of this Project is to create a daemon for a server, witch update live sy
 - wget
 - sed
 - sendemail
+- curl
 
 ## To Do
 

autogen.sh

@@ -1,77 +1,131 @@
 #!/bin/bash
-# at the moment only generate dir structure in /build
+#  install | clean | debug | build-deb
 
-#make ...
 function clean() {
-  echo "clear build"
-  [ -d build ] && rm -v -R build
-  mkdir build
+    echo "clear build"
+    [ -d build ] && rm -v -R build
+    mkdir build
 }
-function build() {
-  echo "build ..."
-  ## skripte copieren ##
-  # remaster
-  mkdir -p build/usr/bin/
-  cp -v src/remaster.sh build/usr/bin/remaster
-  chmod +x build/usr/bin/remaster
+function copy() {
+    echo "copy files ..."
+    # remaster
+    mkdir -p build/usr/bin/
+    cp -v src/remaster.sh build/usr/bin/remaster
+    chmod +x build/usr/bin/remaster
 
-  # modules
-  mkdir -p build/usr/lib/remaster/
-  for i in proj func mods; do
-    mkdir -p build/usr/lib/remaster/$i
-    cp -v src/$i/* build/usr/lib/remaster/$i/
-  done
+    # modules
+    mkdir -p build/usr/lib/remaster/
+    for i in proj func mods; do
+        mkdir -p build/usr/lib/remaster/$i
+        cp -v src/$i/* build/usr/lib/remaster/$i/
+    done
 
-  # setting
-  mkdir -p build/etc/remaster/
-  cp -v src/config.sample.cfg build/etc/remaster/config.sample.cfg
+    # setting
+    mkdir -p build/etc/remaster/
+    cp -v src/config.sample.cfg build/etc/remaster/config.sample.cfg
 
+    #changelog
+    mkdir -p build/usr/share/doc/remaster
+    cp -v changes/remaster.md build/usr/share/doc/remaster/changelog
+    gzip --best build/usr/share/doc/remaster/changelog
 }
 
 #config ...
 function set_rootdir() {
-  sed -i "s#<ROOTDIR>#$1#g" build/usr/bin/remaster
-  for i in proj func mods; do
-    sed -i "s#<ROOTDIR>#$1#g" build/usr/lib/remaster/$i/*
-  done
+    sed -i "s#<ROOTDIR>#$1#g" build/usr/bin/remaster
+    for i in proj func mods; do
+        sed -i "s#<ROOTDIR>#$1#g" build/usr/lib/remaster/$i/*
+    done
 }
 function set_libdir() {
-  sed -i "s#<LIBDIR>#$1#g" build/usr/bin/remaster
-  for i in proj func mods; do
-    sed -i "s#<LIBDIR>#$1#g" build/usr/lib/remaster/$i/*
-  done
+    sed -i "s#<LIBDIR>#$1#g" build/usr/bin/remaster
+    for i in proj func mods; do
+        sed -i "s#<LIBDIR>#$1#g" build/usr/lib/remaster/$i/*
+    done
 }
 
 #modes
 function debug() {
-  clean
-  build
-  set_rootdir "`pwd`/build"
-  set_libdir "`pwd`/build/usr/lib/remaster"
+    clean
+
+    #prebuild
+    copy
+    set_rootdir "`pwd`/build"
+    set_libdir "`pwd`/build/usr/lib/remaster"
 }
 function install() {
-  clean
-  build
-  set_rootdir ""
-  set_libdir "/usr/lib/remaster"
-  #cp -f -r build/* /
+    #überprüfe auf root
+    [ "`id -u`" != "0" ] && { echo "Error start as root"; exit 1; }
+
+    #lösche alltes build dir
+    clean
+
+    #prebuild
+    copy
+    set_rootdir ""
+    set_libdir "/usr/lib/remaster"
+
+    #set owner
+    chown -r root:root build/
+
+    #install
+    cp -f -r build/* /
+}
+function build-deb() {
+    #überprüfe auf root
+    [ "`id -u`" != "0" ] && { echo "Error start as root"; exit 1; }
+
+    #lösche alltes build dir
+    clean
+
+    #prebuild
+    copy
+    set_rootdir ""
+    set_libdir "/usr/lib/remaster"
+    ####
+    ## changes for deb file
+    ####
+    cp -v -r -f DEBIAN build/
+    #create md5sums
+    find ./build -type f -exec md5sum {} \; | grep -v './build/DEBIAN' | sed 's/\.\/build\///g' > build/DEBIAN/md5sums
+    chmod 0644 build/DEBIAN/md5sums
+
+    #set size
+    SIZE="`du --exclude=build/DEBIAN -c build/ | cut -f 1 | tail -n 1`"
+    sed -i "s/<SIZE>/$SIZE/g" build/DEBIAN/control
+
+    #set owner
+    chown -r root:root build/
+
+    ##
+    #build deb
+    ##
+    dpkg -b build/
+    version="`cat build/DEBIAN/control | grep Version | cut -d " " -f 2`"
+    arch="`cat build/DEBIAN/control | grep Arch | cut -d " " -f 2`"
+    [ -f "release/remaster_"$version"_"$arch".deb" ] && rm "release/remaster_"$version"_"$arch".deb"
+    mkdir -p release
+    mv -v "build.deb" "release/remaster_"$version"_"$arch".deb"
 }
 
 
 case "$1" in
-  install)
-    install || exit 1
-    ;;
-  clean)
-    clean || exit 1
-    ;;
-  debug)
-    debug || exit 1
-    ;;
-  build)
-    build || exit 1
-    ;;
-  *)
-    echo "Usage: install | clean | debug | build"
-    exit 1
+    install)
+        install || exit 1
+        ;;
+    clean)
+        clean || exit 1
+        ;;
+    debug)
+        debug || exit 1
+        ;;
+    copy)
+        copy || exit 1
+        ;;
+    build-deb)
+        build-deb || exit 1
+        ;;
+    *)
+        echo "Usage: install | clean | debug | build-deb"
+        exit 1
 esac

changes/remaster.md

@@ -1,8 +0,0 @@
-2018-04-26 - 1.9.1
- * seperate script and config
-
-2018-05-10 - 1.9.2
- * exec singel func
-
-2018-05-10 - 1.9.3
- * hotfix-1.9.3

doc/Strukture.md

@@ -1,28 +0,0 @@
-# Src
-
-raw scripts ..
-
-## functions
-
- - creat iso
- - burn cd ...
- - clean workspace ...
-
-
-## distros
-
-scripts vor distros
- - update
- - set network settings
- - set OS settings
-
-## mods
- - for example: install & enable xrdp
- - set default passwd
- - ...
-
-## web
-placeholder for webfiles ...
-
-## pxe
-placeholder for pxefiles ...

doc/errors.txt

@@ -1,13 +1,13 @@
-Erorr Liste:
+Erorrs:
 
 ID:		Description
 ----------------------------------------------------
-1		Allgemeiner Fehler
-2		No Paramters / wrong parameters
-3		Wrong Settings!
-4		Programm missing
+1		general error
+2		no paramters / wrong parameters
+3		wrong settings
+4		programm missing
 
-10		no root
+10		need root permission
 11		file no found
 12		dir not found
 13		cant create/delete file/dir

doc/lib-head+tail

@@ -0,0 +1,13 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#<function> [param]
+function <function>() {
+    #Code of <function>
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    <function> $@
+}

doc/lib-header.txt

@@ -1,5 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#beginn func

doc/proj-head

@@ -0,0 +1,8 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#<PROJECT_NAME>
+#<project_relation>
+source <LIBDIR>/proj/<BASE>
+project_relation="<PROJECT_NAME> $project_relation"

doc/structure.md

@@ -0,0 +1,111 @@
+## 1.1 Load base functions                                      [-> #functions]
+
+## 1.2 Check ...
+  * for updates
+  * for rights
+
+## 1.3 Load settings                                             [-> #config]
+  * lade /etc/remaster/<Conf>
+  * verify config (Proj Exist; Mods Exist; ...)
+
+## 1.4 Load Proj-Func                                            [-> #projects]
+  * overload based on dependencys
+  * (z.B.  ubuntu.16.04 -> ubuntu -> debian)
+  * verify config (Proj Conform)
+
+## 1.5 Load $n Mods (optional)                                   [-> #mods]
+  * check
+  * save in MOD_LST
+
+# 2. Init Chroot
+
+## 2.1 Extrackt Files
+  * ISO
+  * Squashfs
+
+## 2.2 Config for Chroot (chroot_initial)
+  * (lxc-conf / tmpdir)
+  * network
+
+## 2.3 Start Chroot
+  * (lxc-start / mount ...)
+
+# 3. Modivikationen
+
+## 3.1 Network
+
+## 3.2 Proj-Spez.
+  * (z.B. Desinfect: conky_info)
+
+## 3.3 Packet Mgr
+  * Updates
+  * Install
+  * Delete
+
+## 3.4 Next in $MOD_LST
+  * z.B. xrdp
+  * z.B. default pw
+
+# 4. Finish
+
+## 4.1 Clean-Up Live-System
+  * tmpfiles
+  * Packet Mgr
+
+## 4.2 Stop chroot
+  * Umount
+
+## 4.3. Generate ISO/PXE
+
+## 4.4. Delete Chroot
+
+# 5. Send Log
+
+----
+
+## lxc
+
+-> chroot_sh exec lxc-attach
+
+-> chroot_dir = container name
+
+----
+
+## PXE
+
+-> Install
+  * DHCP Relay
+  * NFS-Server
+  * TFTP-Server
+  * [Samba]
+
+-> Setup
+  * (use <Lib>/proj/<proj> func)
+  * SMB/NFS LiveSys export
+  * TFTP (Boot Menue; Boot Loader; Kernel&Initrd)
+
+-> Deinstall
+  * RM TFTP-Root
+  * RM SMB/NFS LiveSys export
+  * del DHCP Relay conf
+
+----
+
+## Jobs
+  * Read Confs -> get time interfall I
+  * Exec remaster <Conf> for I
+
+----
+
+## Web
+
+show/edit #Configs
+
+show (+live) #Logs
+
+start/stop/plan #Jobs
+
+start/stop/edit #PXE menue
+  * default
+  * all / single / none
+  * live view new clients

script/add_function.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#check param
+[ -z "$1" ] && { echo "$0 [name]"; exit 1; }
+name="$1"
+
+#gen function
+cp "doc/lib-head+tail" "src/func/$name"
+sed -i "s/<function>/$name/g" "src/func/$name"
+
+#open
+editor "src/func/$name"

script/add_project.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+#check param
+[ -z "$1" ] && { echo "$0 \"name\" [base]"; exit 1; }
+name="$1"
+base="$2"
+
+#gen project
+cp "doc/proj-head" "src/proj/$name"
+
+#set base_relations
+if [ -z "$base" ]; then
+  base_relations="base"
+  base="base"
+  sed -i "/project_relation=/c\project_relation=\"<PROJECT_NAME>\"" "src/proj/$name"
+else
+  [ -f "src/proj/$base" ] || {
+    echo "BASE: $base dont exist"
+    exit 1
+  }
+  #get base of $base
+  base_base=`grep '# . ->' src/proj/$base`
+  base_relations=`echo $base_base | sed "s/#\ \./$base/g"`
+fi
+
+## replace strings
+# . -> <PROJECT_PARENT> -> base
+sed -i "s/<project_relation>/\ \.\ ->\ $base_relations/g" "src/proj/$name"
+#<PROJECT_NAME>
+sed -i "s/<PROJECT_NAME>/$name/g" "src/proj/$name"
+sed -i "s/<BASE>/$base/g" "src/proj/$name"
+
+#open
+editor "src/proj/$name"

script/get_version.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep '@version ' src/remaster.sh | cut -d " " -f 2

script/set_version.sh

@@ -8,15 +8,20 @@ date=`date +%Y-%m-%d`
   version_sed=`echo $version | sed 's/\./\\./g'`
 
   #nummer
-  sed -i "s/@version\ .\..\../@version\ $version_sed/g" src/remaster.sh
+  sed -i "/#@version\ /c\#@version\ $version_sed" src/remaster.sh
+  sed -i "/echo\ Remaster\ /c\ \ \ \ \ \ \ \ \ \ echo\ Remaster\ $version_sed" src/remaster.sh
 
   #datum
-  sed -i "s/@date\ ....-..-../@date\ $date/g" src/remaster.sh
+  sed -i "/#@date\ /c\#@date\ $date" src/remaster.sh
 }
 
-[ -e "changes/remaster.md" ] && {
+[ -e "Changelog.md" ] && {
 
-  echo >> changes/remaster.md
-  echo $date - $version >> changes/remaster.md
-  echo pleace update changes/remaster.md
+  echo >> Changelog.md
+  echo $date - $version >> Changelog.md
+  $EDITOR Changelog.md
+}
+
+[ -f "DEBIAN/control" ] && {
+  sed -i "/Version:\ /c\Version:\ $version_sed" "DEBIAN/control"
 }

src/config.sample.cfg

@@ -1,39 +1,39 @@
-#cfg
 
 #########################################################
 ## sample-config rename it to config.cfg after changes ##
 #########################################################
 
-## MODUS
-modus_default="update_pxe"
+## Quelle der Project CD/DVD
+iso_source="/data/local/Desinfect_Remaster/tmp/desinfect-2017.iso"
 
-#CD/DVD
-#entweder iso_source oder filesystem_source alls quelle
-# -> bei iso gen erforderlich!
-iso_source="/data/remaster/desinfect-2017.iso"
-#destination optinal
-iso_destination="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
+## Pfad zum gepakten Live System
+## (kann anstat einer ISO auch als Quelle dienen, dann aber auch zwingend als Ziel)
+# squashfs_path="/data/local/Desinfect_Remaster/tmp/filesystem.squashfs"
+
+## Ziel, Lable der zu erstellenden CD/DVD
+iso_aim="/data/local/Desinfect_Remaster/tmp/custom_desinfect_`date '+%Y-%m-%d'`.iso"
 iso_lable="DESINFECT_`date '+%Y-%m-%d'`"
 
-#Filesystem (for pxe)
-#entweder iso_source oder filesystem_source alls quelle
-filesystem_source="/data/remaster/result/filesystem.squashfs"
 
-#Network
-proxy_host="proxy.local"
-proxy_port="8080"
-domain="local"
-nameserver="10.x.x.2,10.x.x.1"
+## Netzwerk Sinstellungen
+## Proxy:
+# proxy_host="10.40.8.108"
+# proxy_port="8080"
+domain="fritz.box"
+nameserver="10.40.255.254"
 
-#remaster_script
-distro="desinfect2017"
+## Project / Distro
+## Aktuell unterstützt: debian; ubuntu; ubuntu.14.04; ubuntu.16.04; desinfect.17
+project="desinfect.17"
 
-#LOG
-log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log"
-log_mail_source="desinfect@email.clocal"
-log_mail_smtp="smtp.mail.local:25"
-log_mail_aim="6543@email.clocal"
-log_mail_subject="Desinfect_Remaster"
+## LOG Einstellungen
+## log_file ist optionall
+log_file="/data/local/Desinfect_Remaster/tmp/logs/`date '+%Y-%m-%d'`.log"
+## Senden mit sendmail einen Report
+# log_mail_source="desinfect@email.clocal"
+# log_mail_smtp="smtp.mail.local:25"
+# log_mail_aim="6543@email.clocal"
+# log_mail_subject="Desinfect_Remaster"
 
 #Sonstiges
 tools_list="xrdp clamav nano htop nmon iftop tmux dsniff nmap openssh-server tightvncserver rsync e2fsprogs foremost gddrescue recoverjpeg safecopy sleuthkit testdisk arp-scan"

src/func/check_config

@@ -0,0 +1,55 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#check_config
+function check_config() {
+
+    #Project
+    [ -f "<LIBDIR>/proj/$project" ] || {
+        echo "No Project \"$project\" is not supported"
+        return 3
+    }
+
+    #live-system files
+    if [ -f "$iso_source" ]; then
+        if [ -n "$iso_aim" ] && [ -d "${iso_aim%/*}" ]; then
+            #Lable
+            [ -z "$iso_lable" ] && iso_lable="$project"
+
+            echo 'iso_source -> iso_aim'
+            echo 'iso_source -> squashfs [optinal]'
+        else
+            if [ -n "$squashfs_path" ] && [ -d "${squashfs_path%/*}" ]; then
+                echo 'iso_source -> squashfs'
+            else
+                # ERROR
+                echo "No corect AIM in Settings"
+                return 3
+            fi
+        fi
+    else
+        if [ -f "$squashfs_path" ]; then
+            if [ -n "$iso_aim" ]; then
+                # ERROR
+                echo "only Squashfs source in Settings, cant creat ISO"
+                return 3
+            else
+                echo 'squashfs -> squashfs'
+            fi
+        else
+            # ERROR
+            echo "No corect Source in Settings"
+            return 3
+        fi
+    fi
+
+
+
+
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    check_config $@
+}

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 $@
 }

src/func/check_update

@@ -0,0 +1,17 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#check_update
+function check_update() {
+    if curl https://raw.githubusercontent.com/6543/remaster/master/changes/remaster.md | diff - <(zcat <ROOTDIR>/usr/share/doc/remaster/changelog.gz ); then
+			echo 'INFO: Programm Aktuell'
+	else
+			echo 'WARNUNG: Ausgeführte Version entspricht nicht dem offiziellen Release'
+    fi
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    check_update
+}

src/func/check_url

@@ -0,0 +1,20 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#check_url [URL]
+function check_url() {
+    URL="$1"
+    if [[ `wget -S --spider "$URL"  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
+      echo "true"
+      return 0
+    else
+      echo "false"
+      return 1
+    fi
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    check_url $@
+}

src/func/check_user

@@ -11,7 +11,7 @@ function check_user() {
 	}
 }
 
+#this func is standalone executable
 [ -n "$1" ] && {
-  echo param
-  $1
+  check_user $@
 }

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 $@
 }

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 $@
 }

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 $@
 }

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 $@
 }

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 $@
 }

src/func/clear_config

@@ -0,0 +1,35 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#check_config
+function clear_config() {
+
+  ## Source & Aim options
+  iso_source=
+  squashfs_path=
+  iso_aim=
+  iso_lable=
+
+  ## network
+  proxy_host=
+  proxy_port=
+  domain=
+  nameserver=
+
+  ## Project / Distro
+  project=
+
+  ## LOG Settings
+  log_file=
+  log_mail_source=
+  log_mail_smtp=
+  log_mail_aim=
+  log_mail_subject=
+
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    clear_config $@
+}

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 $@
 }

src/func/filesystem_extract

@@ -2,6 +2,9 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
+#dependency
+source <LIBDIR>/func/filesystem_get_type
+
 #filesystem_extract [filesystem_img_source] [chroot_path]
 function filesystem_extract() {
 	echo "extract filesystem ..."
@@ -42,7 +45,7 @@ function filesystem_extract() {
 	echo "done"
 }
 
+#this func is standalone executable
 [ -n "$1" ] && {
-  echo param
-  $1
+  filesystem_extract $@
 }

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 $@
 }

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 $@
 }

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 $@
 }

src/func/iso_extract

@@ -15,18 +15,26 @@ function iso_extract() {
 		return 10
 	}
 
-	iso_source="$1"
-	[ -f "$iso_source" ] || {
-		echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
-		return 11
-	}
-
 	iso_extr_dir="$2"
 	[ -d "$iso_extr_dir" ] || {
 		echo "### ERROR ### iso_extract: aim directory not exist!"
 		return 12
 	}
 
+	iso_source="$1"
+	[ -f "$iso_source" ] || {
+		#if it is an url...
+		if [ "`check_url $iso_source`" == "true" ]; then
+			#dl to tmp + set iso_source
+			iso_tmp="`mktemp --suffix=.iso`"; rm "$iso_tmp"
+			wget -O "$iso_tmp" "$iso_source"
+		else
+			echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
+			return 11
+		fi
+	}
+
+
 	#mace tmp mountpoint
 	tmpdir="`mktemp -d`"
 	[ -d "$iso_extr_dir" ] && {
@@ -41,12 +49,13 @@ function iso_extract() {
 	#clear tmp mountpoint
 	umount "$iso_source"
 	rm -r "$tmpdir"
+	[ -n "$iso_tmp" ] && rm "$iso_tmp"
 	tmpdir=
 
 	echo "done"
 }
 
+#this func is standalone executable
 [ -n "$1" ] && {
-  echo param
-  $1
+  iso_extract $@
 }

src/func/on_exit

@@ -4,31 +4,34 @@
 
 #on_exit [error_level]
 function on_exit() {
-	#send log and errorlevel[success/errorr xy]
+  ### send mail
+  [ -n "$log_mail_aim" ] && {
+    #send log and errorlevel[success/errorr xy]
+    if [ "$1" != "0" ]; then
+      log_mail_subject="$log_mail_subject [ERROR]"
+    else
+      log_mail_subject="$log_mail_subject [Success]"
+    fi
 
-	if [ "$1" != "0" ]; then
-		log_mail_subject="$log_mail_subject [ERROR]"
-	else
-		log_mail_subject="$log_mail_subject [Success]"
-	fi
+    #Mail Body:
+    for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
+      {
+        echo "$log_mail_subject"
+        echo $'####################################################################################\n\n'
+        cat "$log_file"
+      } | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
+    done
+  }
 
-	#Mail Body:
-	for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
-		{
-			echo "$log_mail_subject"
-			echo $'####################################################################################\n\n'
-			cat "$log_file"
-		} | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
-	done
-
-	[ "$1" != "0" ] && {
-		chroot_umount$distro "$chroot_path" 2> /dev/null
-		workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
-	}
-	exit $1
+  ### clean up
+  [ "$1" != "0" ] && {
+    chroot_umount$distro "$chroot_path" 2> /dev/null
+    workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
+  }
+  exit $1
 }
 
+#this func is standalone executable
 [ -n "$1" ] && {
-  echo param
-  $1
+  on_exit $@
 }

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 $@
 }

src/mods/xrdp

@@ -10,7 +10,7 @@
 
 
 
+#this func is standalone executable
 [ -n "$1" ] && {
-  echo param
-  $1
+  xrdp $@
 }

src/proj/base

@@ -0,0 +1,34 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+##################
+##### B a s e ####
+##################
+# .
+project_relation=""
+[ -z "$project" ] && project=base
+
+#tools_add [chroot_dir] [tools_list]
+function tools_add() {
+	echo "$project: tools_add ot available"
+}
+
+#os_update [chroot_dir]
+function os_update() {
+	echo "$project: os_update ot available"
+}
+
+#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable() {
+	echo "$project: proxy_enable ot available"
+}
+
+#dns_set [chroot_dir] [domain] [nameserver]
+function dns_set() {
+	echo "$project: dns_set ot available"
+}
+
+function project_mods() {
+	echo "$project: project_mods ot available"
+}

src/proj/debian

@@ -2,14 +2,18 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
+source <LIBDIR>/proj/base
+#debian
+# . -> base
+project_relation="debian"
+
 ####################################
 ##### Base Template D E B I A N ####
 ####################################
-# .
 
 
 #tools_add [chroot_dir] [tools_list]
-function tools_add() {
+function tools_add-debian() {
 	echo "add tools ... "
 	#$1 = chroot directory
 	chroot_dir="$1"
@@ -20,9 +24,10 @@ function tools_add() {
 	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"
 }
+function tools_add() { tools_add-debian $@; }
 
 #os_update [chroot_dir]
-function os_update() {
+function os_update-debian() {
 	echo "updating os ... "
 	#$1 = chroot directory
 
@@ -35,8 +40,59 @@ function os_update() {
 
 	echo "done"
 }
+function os_update() { os_update-debian $@; }
 
-[ -n "$1" ] && {
-  echo param
-  $1
+#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable-debian() {
+  echo -n "enable proxy ... "
+
+  chroot_dir="$1"
+  proxy_host="$2"
+  proxy_port="$3"
+
+  [ -d "$chroot_dir" ] || {
+    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
+    return 12
+  }
+
+  #Wenn alle zwei Parameter gegeben
+  if [ "$proxy_host" != "" ] && [ "$proxy_port" != "" ] ; then
+    echo "http_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "https_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "ftp_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+
+    echo "HTTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "HTTPS_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "FTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+
+    echo "Acquire::http::Proxy  \"http://$proxy_host:$proxy_port\"\;" > $chroot_dir/etc/apt/apt.conf.d/90proxy
+    echo "Acquire::ftp::Proxy \"ftp://$proxy_host:$proxy_port\"\;" >> $chroot_dir/etc/apt/apt.conf.d/90proxy
+
+    echo "done"
+  else
+    if [ "$proxy_host" == "" ] && [ "$proxy_port" == "" ] ; then
+      echo "done"
+    else
+      echo "### ERROR ### proxy_enable: wrong parameters! (\"$chroot_dir\"; \"$proxy_host\"; \"$proxy_port\")"
+      echo "proxy_enable [chroot_dir] [proxy_host] [proxy_port]"
+      return 2
+    fi
+  fi
 }
+function proxy_enable() { proxy_enable-debian $@; }
+
+#dns_set [chroot_dir] [domain] [nameserver]
+function dns_set-debian() {
+  echo -n "set dns config ... "
+
+  rm "$chroot_dir/etc/resolv.conf"
+
+  [ "$2" != "" ] && echo "domain $2" >> "$chroot_dir/etc/resolv.conf"
+  echo "search $2" >> "$chroot_dir/etc/resolv.conf"
+  for namesv in `echo "$3" | tr "," " "`; do
+    echo "nameserver $namesv" >> "$chroot_dir/etc/resolv.conf"
+  done
+
+  echo "done"
+}
+function dns_set() { dns_set-debian $@; }

src/proj/desinfect.17

@@ -5,10 +5,259 @@
 #desinfect.17
 # . -Y ubuntu.16.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.16.04
+project_relation="desinfect.17 $project_relation"
 
-TEST2="na"
 
-[ -n "$1" ] && {
-  echo param
-  $1
+#sourcelist_desinfect_set_nomal2017 [chroot_dir]
+function sourcelist_desinfect_set_nomal2017() {
+  echo -n "build normal source.list ... "
+  #$1 = chroot directory
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2017 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "# #### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
+  echo "# deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
+
+  echo "done"
 }
+
+#sourcelist_desinfect_set_extendet2017 [chroot_dir]
+function sourcelist_desinfect_set_extendet2017() {
+  echo -n "build extendet source.list ... "
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2017 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "#### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "## developers who want to ship their latest software." >> "$sourcelist"
+  echo "deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#os_update-desinfect.17 [chroot_dir]
+function os_update-desinfect.17() {
+  #$1 = chroot directory
+
+  chroot_dir="$1"
+
+  #call main os_update from debian
+  os_update-debian "$chroot_dir"
+
+  echo "update virus definitions ... "
+
+  #Avast Avira
+  {
+    echo "Avira ..."
+    #chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; /AntiVirUpdate/avupdate" | grep -v " -> "
+    chroot_sh "$chroot_dir" "/AntiVirUpdate/avupdate" | grep -v " -> "
+    echo "Avira done"
+  }
+
+  #Clam AV
+  {
+    echo "ClamAV..."
+    #chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; freshclam" > /dev/null
+    chroot_sh "$chroot_dir" "freshclam" > /dev/null
+    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
+    echo "ClamAV done"
+  }
+
+  #Eset AV
+  {
+    echo "Eset AV ..."
+    tmp_file_23421="`mktemp`"
+    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
+    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    av_eaet_timeout=300
+    echo "set timeout: $((av_eaet_timeout/60))min"
+    tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
+
+    #eig. update routine
+    #chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
+    chroot_sh "$chroot_dir" "/etc/init.d/esets restart"
+    sleep 2
+    #chroot "$chroot_dir" /bin/bash --login -c "/opt/eset/esets/sbin/esets_daemon --update"
+    chroot_sh "$chroot_dir" "/opt/eset/esets/sbin/esets_daemon --update"
+
+    #warten auf daemon update ...
+    echo "wait $((av_eaet_timeout/60))min for Eset AV update"
+    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
+      sleep 10
+      av_eaet_timeout=$((av_eaet_timeout-10))
+      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
+    done
+
+    sleep 4
+
+    #chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
+    chroot_sh "$chroot_dir" "/etc/init.d/esets stop"
+
+    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    rm "$tmp_file_23421"
+    tmp_file_23421=
+    tmp_var_3092=
+    echo "Eset AV done"
+  }
+
+  #Sophos
+  {
+    echo "Sophos..."
+    #chroot "$chroot_dir" /bin/bash --login -c "/opt/sophos-av/bin/savupdate -v3"
+    chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savupdate -v3"
+    chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savdstatus --version"
+    #chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3 -a"
+    echo "Sophos done"
+  }
+
+  #F-Secure
+  {
+    echo "F-Secure..."
+    chroot_sh "$chroot_dir" "/etc/init.d/fsaua start"
+    chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
+    ( sleep 1m; chroot_sh "$chroot_dir" "/etc/init.d/fsaua start" ) &
+    chroot_sh "$chroot_dir" "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
+    sleep 1m
+    chroot_sh "$chroot_dir" "/etc/init.d/fsaua stop"
+    chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
+    echo "F-Secure done"
+  }
+
+  echo "update virus definitions done"
+}
+function os_update() { os_update-desinfect.17 $@; }
+
+#proxy_enable-desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable-desinfect.17() {
+
+  proxy_enable-debian $1 $2 $3
+
+  echo "enable proxy for desinfect's av ... "
+
+  chroot_dir="$1"
+  proxy_host="$2"
+  proxy_port="$3"
+  tmp_file_344532="`mktemp`"
+
+  #Avast AntiVirus
+  if [ -f "$chroot_dir/AntiVirUpdate/avupdate" ]; then
+    echo "Avast AntiVirus: Found"
+    sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+    sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+  else
+    eco "Avast AntiVirus: NOT Found"
+  fi
+
+  #Eset AV
+  if [ -f "$chroot_dir/etc/opt/eset/esets/esets.cfg" ]; then
+    echo "Eset AV: Found"
+    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
+    rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+  else
+    eco "Eset AV: NOT Found"
+  fi
+
+  #ClamAV
+  if [ -f "$chroot_dir/etc/clamav/freshclam.conf" ]; then
+    echo "ClamAV: Found"
+    cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
+    rm "$chroot_dir/etc/clamav/freshclam.conf"
+    cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
+
+    echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
+    echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
+  else
+    eco "ClamAV: NOT Found"
+  fi
+
+  #Sophos
+  if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
+    echo "Sophos: Found"
+    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
+
+  #F-Secure
+  if [ -f "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" ]; then
+    echo "F-Secure: Found"
+    echo "enable_fsma=no" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    echo "update_servers=http://fsbwserver-direct.f-secure.com" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    echo "update_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    echo "http_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    cat "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" > "$chroot_dir/etc/opt/f-secure/fsaua/fsaua_config"
+  else
+    eco "F-Secure: NOT Found"
+  fi
+
+
+  rm "$tmp_file_344532"
+  tmp_file_344532=
+
+  echo "done"
+}
+function proxy_enable() { proxy_enable-desinfect.17 $@; }
+
+#tools_add-desinfect.17 [chroot_dir] [tools_list]
+function tools_add-desinfect.17() {
+  #$1 = chroot directory
+  chroot_dir="$1"
+  tools_list="$2"
+
+  sourcelist_desinfect_set_extendet2017 "$chroot_dir"
+  tools_add-debian "$chroot_dir" "$tools_list"
+  sourcelist_desinfect_set_nomal2017 "$chroot_dir"
+}
+function tools_add() { tools_add-desinfect.17 $@; }
+
+
+function project_mods-desinfect.17() {
+  #config xrdp to start xfce
+  [ -d "$chroot_path/etc/xrdp/" ] && {
+    echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
+    echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
+    echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
+  }
+}
+function project_mods() { project_mods-desinfect.17 $@; }

src/proj/ubuntu

@@ -7,8 +7,4 @@
 ####################################
 # . -> debian
 source <LIBDIR>/proj/debian
-
-[ -n "$1" ] && {
-  echo param
-  $1
-}
+project_relation="ubuntu $project_relation"

src/proj/ubuntu.14.04

@@ -0,0 +1,8 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#ubuntu.14.04
+# . -> ubuntu -> debian
+source <LIBDIR>/proj/ubuntu
+project_relation="ubuntu.14.04 $project_relation"

src/proj/ubuntu.16.04

@@ -5,8 +5,4 @@
 #ubuntu.16.04
 # . -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu
-
-[ -n "$1" ] && {
-  echo param
-  $1
-}
+project_relation="ubuntu.16.04 $project_relation"