diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 22:31:03 +0200 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 22:31:03 +0200 |
| commit | f7b02f713c4b56504d7b2656b5ccddb4f960a82c (patch) | |
| tree | f82852fb8070b2d91546b7d755656c0ff6a1efe3 /src/shared | |
| parent | 9ef7b5dadfa0fc1bacb93f211ecab4fe18a12581 (diff) | |
fixing more stage3 patches; adding logic to auto-fix bad patch paths
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/feedback.sh | 3 | ||||
| -rw-r--r-- | src/shared/package.sh | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/shared/feedback.sh b/src/shared/feedback.sh index 39e0a0c..340cd49 100644 --- a/src/shared/feedback.sh +++ b/src/shared/feedback.sh @@ -28,8 +28,7 @@ export ERROR_KEYFAIL=5 # messaging functions notify() { # useful if running notify_telegram - local recipient=260151125 - #local recipient=-211578786 + local recipient=-211578786 if type -p notify-send >/dev/null; then machinectl -q shell --uid="$SUDO_USER" .host \ "$(which notify-send)" -h string:recipient:$recipient "$@" >/dev/null diff --git a/src/shared/package.sh b/src/shared/package.sh index 79a7f62..604793c 100644 --- a/src/shared/package.sh +++ b/src/shared/package.sh @@ -120,6 +120,13 @@ package_patch() { local patch="$SRCDIR/patches/$pkgbase$p".patch + # FIXME: this is temporary to fix bad patch names + local badpatch="$SRCDIR/patches/$pkgname".patch + if [ "x$pkgname" != "x$pkgbase" ] && [ -f "$badpatch" ]; then + error -n "$pkgname: $pkgname.patch should be $pkgbase.patch. renaming..." + mv "$badpatch" "$patch" + fi + if [ "x$r" == "xyes" ] && [ ! -e "$patch" ]; then error -n "$pkgname: missing $pkgbase$p.patch" return "$ERROR_MISSING" |