Browse Source

Merge branch 'feature-check-update' into develop

pull/19/head
6543 4 years ago
parent
commit
cdd40d5195
  1. 2
      DEBIAN/control
  2. 3
      changes/remaster.md
  3. 6
      doc/lib-header.txt
  4. 17
      src/func/check_update
  5. 15
      src/remaster.sh

2
DEBIAN/control

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

3
changes/remaster.md

@ -12,3 +12,6 @@
* add Doc "Server Bedienung"
* split functions
* separate config into /etc/remaster/

2018-05-13 - 2.0.1
* Update-Prüfmechanismus #15

6
doc/lib-header.txt

@ -3,3 +3,9 @@
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }

#beginn func


#this func is standalone executable
[ -n "$1" ] && {
check_user
}

17
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 'REMASTER: Aktuell'
else
echo 'REMASTER: Warning: neue Version verfügbar'
fi
}

#this func is standalone executable
[ -n "$1" ] && {
check_update
}

15
src/remaster.sh

@ -1,7 +1,7 @@
#!/bin/bash
#@version 2.0.0
#@version 2.0.1
#@autor 6543@obermui.de
#@date 2018-05-12
#@date 2018-05-13
#@licence GNUv3

#####################################################################################
@ -90,6 +90,8 @@ function main_renew() {
check_dependency
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

check_update | tee -a "$log_file"

[ "$distro" != "" ] && distro="_$distro"

# 2. Entpacke ISO
@ -237,6 +239,8 @@ function main_update_pxe() {
check_user
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

check_update | tee -a "$log_file"

check_dependency
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

@ -357,6 +361,8 @@ function main_update_iso() {
check_user
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

check_update | tee -a "$log_file"

check_dependency
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

@ -465,11 +471,6 @@ function main_update_iso() {
on_exit 0
}

#remaster.sh update
function main_update() {
main_update_pxe
}

#####################################################################################
################## F u n c t i o n s ################################################
#####################################################################################

Loading…
Cancel
Save