From 57b2383ef3faabbcc64c621d09383e008726b7f8 Mon Sep 17 00:00:00 2001 From: 6543 Date: Sat, 12 May 2018 23:12:17 +0200 Subject: [PATCH 1/5] spelling --- changes/remaster.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/changes/remaster.md b/changes/remaster.md index 469a5a0..a16cdea 100644 --- a/changes/remaster.md +++ b/changes/remaster.md @@ -11,5 +11,4 @@ * add feature build debian packages * add Doc "Server Bedienung" * split functions - * seperte config into /etc/remaster/ - + * separate config into /etc/remaster/ From 66372fadcc85f4fc94e9908ffb05da3fa287ffe8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 13 May 2018 00:02:09 +0200 Subject: [PATCH 2/5] add update check --- doc/lib-header.txt | 6 ++++++ src/func/check_update | 17 +++++++++++++++++ src/remaster.sh | 11 ++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100755 src/func/check_update diff --git a/doc/lib-header.txt b/doc/lib-header.txt index 5d8cf28..d3c48f7 100644 --- a/doc/lib-header.txt +++ b/doc/lib-header.txt @@ -3,3 +3,9 @@ [ -d "" ] || { echo "LIBDIR not exist"; exit 1; } #beginn func + + +#this func is standalone executable +[ -n "$1" ] && { + check_user +} diff --git a/src/func/check_update b/src/func/check_update new file mode 100755 index 0000000..7a1847d --- /dev/null +++ b/src/func/check_update @@ -0,0 +1,17 @@ +#!/bin/bash +#remaster lib +[ -d "" ] || { 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 /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 +} diff --git a/src/remaster.sh b/src/remaster.sh index 1ae8b6d..60db4c6 100755 --- a/src/remaster.sh +++ b/src/remaster.sh @@ -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 ################################################ ##################################################################################### From a2517232a1f9fd9a92c707fcff66797915f9a061 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 13 May 2018 00:05:02 +0200 Subject: [PATCH 3/5] add feature check_update --- DEBIAN/control | 2 +- changes/remaster.md | 3 +++ src/remaster.sh | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DEBIAN/control b/DEBIAN/control index 8580391..60e8e16 100644 --- a/DEBIAN/control +++ b/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: diff --git a/changes/remaster.md b/changes/remaster.md index a16cdea..8ac2a7b 100644 --- a/changes/remaster.md +++ b/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 diff --git a/src/remaster.sh b/src/remaster.sh index 60db4c6..8ab6efe 100755 --- a/src/remaster.sh +++ b/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 ##################################################################################### From d2f7a45d6cf2e7f513bddf85c106f09d529d9c1a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 13 May 2018 00:30:53 +0200 Subject: [PATCH 4/5] hotfix-2.0.2 --- autogen.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/autogen.sh b/autogen.sh index d9b6286..377d025 100755 --- a/autogen.sh +++ b/autogen.sh @@ -104,6 +104,7 @@ function build-deb() { 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" } From b3894fedc9ccd0dd7b2ca9c6181297d7ea614aa7 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 13 May 2018 00:33:39 +0200 Subject: [PATCH 5/5] hotfix-2.0.2 --- DEBIAN/control | 2 +- changes/remaster.md | 3 +++ src/remaster.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEBIAN/control b/DEBIAN/control index 60e8e16..e35de60 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -1,6 +1,6 @@ Package: remaster Source: remaster -Version: 2.0.1 +Version: 2.0.2 Architecture: all Maintainer: 6543 <6543@obermui.de> Installed-Size: diff --git a/changes/remaster.md b/changes/remaster.md index 8ac2a7b..eb79d3f 100644 --- a/changes/remaster.md +++ b/changes/remaster.md @@ -15,3 +15,6 @@ 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 ) diff --git a/src/remaster.sh b/src/remaster.sh index 8ab6efe..9fded8b 100755 --- a/src/remaster.sh +++ b/src/remaster.sh @@ -1,5 +1,5 @@ #!/bin/bash -#@version 2.0.1 +#@version 2.0.2 #@autor 6543@obermui.de #@date 2018-05-13 #@licence GNUv3