summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfelics2018-07-18 15:38:32 +0200
committerfelics2018-07-18 15:38:32 +0200
commit8423f5bc8e3f312598c3861d3147279fc715026a (patch)
tree4dec2449f88e915d75b09467ed24a18957a0792b
parentb301382a3605b4842c108d7d255f36b41a27b2f3 (diff)
downloadaur-8423f5bc8e3f312598c3861d3147279fc715026a.tar.gz
Made output more fancy.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rwxr-xr-xidos-packages-update.sh26
3 files changed, 15 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b0a466b48cca..f0d2dc3cd77c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = idos-package-updater-script
pkgdesc = Bash script which automates the process of updating installed IDOS timetable browser related packages by reinstalling and thus fetching the newest version.
- pkgver = 20180718.3
+ pkgver = 20180718.4
pkgrel = 1
epoch = 0
arch = any
@@ -11,7 +11,7 @@ pkgbase = idos-package-updater-script
depends = yaourt
source = idos-packages-update.sh
source = copying.txt
- sha256sums = 9dedbc45239a0317d3263a787d4bd26550351c6101ba784d9bad0d550bc55644
+ sha256sums = 0a7e1c1cc1772c3da14a7870be357854733d030e712b5a7c0fc53a51967ada30
sha256sums = c3cbff25307e905545788f5c74cc137d79706c60549092f2a37919b93cf55ee3
pkgname = idos-package-updater-script
diff --git a/PKGBUILD b/PKGBUILD
index 7fd44e75a902..1984a6381883 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_pkgname=idos-package-updater-script
pkgname="${_pkgname}"
epoch=0
-pkgver=20180718.3
+pkgver=20180718.4
pkgrel=1
pkgdesc="Bash script which automates the process of updating installed IDOS timetable browser related packages by reinstalling and thus fetching the newest version."
arch=('any')
@@ -38,7 +38,7 @@ source=(
)
sha256sums=(
- "9dedbc45239a0317d3263a787d4bd26550351c6101ba784d9bad0d550bc55644"
+ "0a7e1c1cc1772c3da14a7870be357854733d030e712b5a7c0fc53a51967ada30"
"c3cbff25307e905545788f5c74cc137d79706c60549092f2a37919b93cf55ee3"
)
diff --git a/idos-packages-update.sh b/idos-packages-update.sh
index 07339b80a15f..22cd7f70b983 100755
--- a/idos-packages-update.sh
+++ b/idos-packages-update.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=20180718.3
+VERSION=20180718.4
##
#
@@ -278,10 +278,15 @@ echo ""
_info="$(sed -En 's|^.*v=([^ ]*).*$|\1|gp' <<< "${_flags}")"
_old_ver="$(sed -En 's|^.*ov=([^ ]*).*$|\1|gp' <<< "${_flags}")"
_aur_ver="$(sed -En 's|^.*av=([^ ]*).*$|\1|gp' <<< "${_flags}")"
+ if [ -n "${_aur_ver}" ]; then
+ _ver_diff="$(compare_versions "${_old_ver}" "${_aur_ver}")"
+ else
+ _ver_diff="|"
+ fi
- cat <<< "${_info}|${_pkg}|${_old_ver}|${_aur_ver}"
+ cat <<< "${_info} |;${_pkg};| ${_old_ver};${_ver_diff} ${_aur_ver}"
done
-} | column -o ' | ' -s '|' -t -R 1,2 -N 'Upgr.?,package,local ver.,AUR ver.'
+} | column -o ' ' -s ';' -t -R 1,2 -N 'Upgr.?,package,local ver.,AUR ver.'
msg ''
@@ -316,17 +321,8 @@ echo ""
_flags="${pkgs["${_pkg}"]}"
_old_ver="$(sed -En 's|^.*ov=([^ ]*).*$|\1|gp' <<< "${_flags}")"
_new_ver="$(sed -En 's|^.*nv=([^ ]*).*$|\1|gp' <<< "${_flags}")"
+ _ver_diff="$(compare_versions "${_old_ver}" "${_new_ver}")"
- if [ -n "${_aur_ver}" ]; then
- if [ "$(compare_versions "${_new_ver}" "${_old_ver}")" == ">" ]; then
- _been_updated_info='(y)'
- else
- _been_updated_info='(n)'
- fi
- else
- _been_updated_info='(-)'
- fi
-
- cat <<< "${_been_updated_info}|${_pkg}|${_old_ver}|${_new_ver}"
+ cat <<< "${_pkg};| ${_old_ver};| ${_ver_diff} ${_new_ver}"
done
-} | column -o ' | ' -s '|' -t -R 1,2 -N 'Newer ver.?,package,old ver.,new ver.'
+} | column -o ' ' -s ';' -t -R 1,2 -N 'package,old ver.,new ver.'