Set Version 2.1.0

checkout Changelog

Changelog.md

@@ -30,3 +30,13 @@
  * 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/control

@@ -1,6 +1,6 @@
 Package: remaster
 Source: remaster
-Version: 2.0.4
+Version: 2.1.0
 Architecture: all
 Maintainer: 6543 <6543@obermui.de>
 Installed-Size: <SIZE>

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)
+[![GitHub release](https://img.shields.io/github/v/release/6543/remaster.svg)](https://github.com/6543/remaster/releases/latest)
+[![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
 
@@ -30,3 +34,7 @@ The aim of this Project is to create a daemon for a server, witch update live sy
 - Ubuntu/Debian
 - Desinfect17
 - one config file
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2F6543%2Fremaster.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2F6543%2Fremaster?ref=badge_large)

doc/notes

@@ -0,0 +1,2 @@
+initrd:
+https://help.ubuntu.com/community/LiveCDCustomization#Removing_the_.28Casper.29_Autologina

script/set_version.sh

@@ -9,16 +9,17 @@ date=`date +%Y-%m-%d`
 
   #nummer
   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 "/#@date\ /c\#@date\ $date" src/remaster.sh
 }
 
-[ -e "changes/remaster.md" ] && {
+[ -e "Changelog.md" ] && {
 
-  echo >> changes/remaster.md
+  echo >> Changelog.md
-  echo $date - $version >> changes/remaster.md
+  echo $date - $version >> Changelog.md
-  editor changes/remaster.md
+  $EDITOR Changelog.md
 }
 
 [ -f "DEBIAN/control" ] && {

src/config.sample.cfg

@@ -1,36 +1,39 @@
-#cfg
 
 #########################################################
 ## sample-config rename it to config.cfg after changes ##
 #########################################################
 
-#CD/DVD
+## Quelle der Project CD/DVD
-#entweder iso_source oder squashfs_path alls quelle
+iso_source="/data/local/Desinfect_Remaster/tmp/desinfect-2017.iso"
-# -> bei iso gen erforderlich!
+
-iso_source="/data/remaster/desinfect-2017.iso"
+## Pfad zum gepakten Live System
-#destination optinal
+## (kann anstat einer ISO auch als Quelle dienen, dann aber auch zwingend als Ziel)
-iso_aim="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
+# 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 squashfs_path alls quelle
-squashfs_path="/data/remaster/result/filesystem.squashfs"
 
-#Network
+## Netzwerk Sinstellungen
-proxy_host="proxy.local"
+## Proxy:
-proxy_port="8080"
+# proxy_host="10.40.8.108"
-domain="local"
+# proxy_port="8080"
-nameserver="10.x.x.2,10.x.x.1"
+domain="fritz.box"
+nameserver="10.40.255.254"
 
-#remaster_script
+## Project / Distro
+## Aktuell unterstützt: debian; ubuntu; ubuntu.14.04; ubuntu.16.04; desinfect.17
 project="desinfect.17"
 
-#LOG
+## LOG Einstellungen
-log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log"
+## log_file ist optionall
-log_mail_source="desinfect@email.clocal"
+log_file="/data/local/Desinfect_Remaster/tmp/logs/`date '+%Y-%m-%d'`.log"
-log_mail_smtp="smtp.mail.local:25"
+## Senden mit sendmail einen Report
-log_mail_aim="6543@email.clocal"
+# log_mail_source="desinfect@email.clocal"
-log_mail_subject="Desinfect_Remaster"
+# 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_update

@@ -7,7 +7,7 @@ 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: neue Version verfügbar'
+			echo 'WARNUNG: Ausgeführte Version entspricht nicht dem offiziellen Release'
     fi
 }
 

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/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 ..."

src/remaster.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-#@version 2.0.4
+#@version 2.1.0
 #@autor 6543@obermui.de
-#@date 2018-05-22
+#@date 2019-09-20
 #@licence GNUv3
 
 #####################################################################################
@@ -43,6 +43,38 @@ fi
     fi
 }
 
+#####################################################################################
+################## H e l p  &  I n f o ##############################################
+#####################################################################################
+
+
+ case $(echo $1 | tr -d '-') in
+    '') ;;
+    version|V)
+          echo Remaster 2.1.0
+          exit 0
+          ;;
+    config|c)
+          if [ -f "$2" ]; then
+              source <LIBDIR>/func/clear_config
+              source "$2"
+          else
+              echo "ERROR Config \"$2\" not found"
+              exit 1
+          fi
+    else
+          ;;
+    *)
+          echo 'Remaster update Live Systems'
+          echo '  more information at: https://github.com/6543/remaster/'
+          echo ''
+          echo '  --version|-V            show current version'
+          echo '  --config|-c <config>    run remaster with custom config'
+          exit 0
+          ;;
+esac
+
+
 #####################################################################################
 ################## F u n c t i o n s ################################################
 #####################################################################################