6543/remaster
1
1
Fork 0
Code Issues 15 Pull Requests Releases 5 Activity

Merge pull request #23 from 6543/develop

Browse Source 
update feature branch
This commit is contained in:
6543
2018-05-20 23:51:20 +02:00
committed by GitHub
parent fb524720f4 9301b1a39c
commit 226c2567d9
13 changed files with 262 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/func/check_config Executable file
View File

@ -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/$distro" ] || {
echo "No Project \"$distro\" is not supported"
return 3
}
#live-system files
if [ -f "$iso_source" ]; then
if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then
#Lable
[ -z "$iso_lable" ] && iso_lable="$distro"
echo 'iso_source -> iso_destination'
echo 'iso_source -> squashfs [optinal]'
else
if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then
echo 'iso_source -> squashfs'
else
# ERROR
echo "No corect AIM in Settings"
return 3
fi
fi
else
if [ -f "$filesystem_source" ]; then
if [ -n "$iso_destination" ]; 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 $@
}

4
src/func/check_update
View File

@ -5,9 +5,9 @@
#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 'REMASTER: Aktuell'
echo 'INFO: Programm Aktuell'
else
echo 'REMASTER: Warning: neue Version verfügbar'
echo 'WARNUNG: neue Version verfügbar'
fi
}

43
src/func/on_exit
View File

@ -4,28 +4,31 @@
#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

0
src/proj/desinfect2017 Normal file
View File

63
src/remaster.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#@version 2.0.2
#@version 2.0.3
#@autor 6543@obermui.de
#@date 2018-05-13
#@date 2018-05-20
#@licence GNUv3
#####################################################################################
@ -25,6 +25,23 @@ else
exit 1
fi
fi
#check LOG
{
[ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
if [ -f "$log_file" ]; then
echo > "$log_file"
else
#check if folder exist
[ -d "${log_file%/*}" ] || {
# N-> exit 3
echo "Directory for Log didnt exist"
exit 3
}
#create LOG
touch "$log_file"
fi
}
#####################################################################################
################## M o d e s ########################################################
@ -32,8 +49,7 @@ fi
#remaster.sh renew
function main_renew() {
[ -f "$log_file" ] || touch "$log_file"
#Start LOG
tail -f "$log_file" --pid="$$" &
chroot_path="`mktemp -d`"
@ -90,7 +106,10 @@ function main_renew() {
check_dependency
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
check_update | tee -a "$log_file"
check_config >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
check_update >> "$log_file"
[ "$distro" != "" ] && distro="_$distro"
@ -113,9 +132,10 @@ function main_renew() {
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
# 5. Setzen der Netzwerk-Einstellungen:
proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
[ -n "$proxy_host" ] && {
proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
}
dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@ -194,8 +214,7 @@ function main_renew() {
#remaster.sh update_pxe
function main_update_pxe() {
[ "$log_file" == "" ] && log_file="`mktemp`"
[ -f "$log_file" ] || touch "$log_file"
#Start LOG
tail -f "$log_file" --pid="$$" &
chroot_path="`mktemp -d`"
@ -239,11 +258,14 @@ function main_update_pxe() {
check_user
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
check_update | tee -a "$log_file"
check_update >> "$log_file"
check_dependency
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
check_config >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
[ "$distro" != "" ] && distro="_$distro"
# 1. Entpacken der Dateien des Live-Systems
@ -307,7 +329,7 @@ function main_update_pxe() {
#remaster.sh update_iso #in arbeit
function main_update_iso() {
[ -f "$log_file" ] || touch "$log_file"
#Start LOG
tail -f "$log_file" --pid="$$" &
chroot_path="`mktemp -d`"
@ -361,11 +383,14 @@ function main_update_iso() {
check_user
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
check_update | tee -a "$log_file"
check_update >> "$log_file"
check_dependency
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
check_config >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
[ "$distro" != "" ] && distro="_$distro"
# 2. Entpacke ISO
@ -397,9 +422,10 @@ function main_update_iso() {
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
# 5. Setzen der Netzwerk-Einstellungen:
proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
[ -n "$proxy_host" ] && {
proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
}
dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@ -477,6 +503,9 @@ function main_update_iso() {
### Error Handlings ###
#check_config
source <LIBDIR>/func/check_config
#on_exit [error_level]
source <LIBDIR>/func/on_exit
@ -490,6 +519,8 @@ source <LIBDIR>/func/check_user
# -> 0 | -> 16
source <LIBDIR>/func/check_dependency
#check_update
source <LIBDIR>/func/check_update
### Workspace ###