[lmi-commits] [lmi] valyuta/004 545a7b3 2/3: Merge branch 'master' into valyuta/004

[Greg Chicares]

branch: valyuta/004
commit 545a7b33b3370471184c75643d8a1b971a42397d
Merge: 48ec029 13ffcfc
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Merge branch 'master' into valyuta/004
    
    This is the result of running
      git merge --verbose --no-ff --no-commit master
    and resolving a few conflicts manually.
---
 .github/workflows/ci.yml | 18 ++++++++++++++++--
 check_script.sh          |  9 ++++++++-
 gwc/.zshrc               |  3 +++
 install_xml_libraries.sh |  2 +-
 irc7702_interest.cpp     |  2 +-
 irc7702_interest.hpp     |  2 +-
 version.hpp              |  4 ++--
 7 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c94945e..6ae2f28 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,10 +32,24 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install required packages
+      - name: Install Wine
+        if: matrix.mingw
         run: |
           sudo dpkg --add-architecture i386
+
+          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo 
apt-key add -
+          sudo add-apt-repository "deb 
https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
+
           sudo apt-get update
+
+          # Workaround the issue with Wine.
+          sudo apt-get install libasound2-plugins:i386 libgphoto2-6:i386
+          sudo apt-get install wine-stable-i386
+          sudo apt-get install wine-stable
+          sudo apt-get install --install-recommends winehq-stable
+
+      - name: Install required packages
+        run: |
           sudo apt-get --assume-yes install \
             automake bc bsdmainutils bzip2 curl cvs default-jre \
             g++-multilib git jing libarchive-tools \
@@ -45,7 +59,7 @@ jobs:
           if ${{ matrix.mingw }}
           then
             sudo apt-get --assume-yes install \
-              g++-mingw-w64-i686 wine32
+              g++-mingw-w64-i686
           else
             sudo apt-get --assume-yes install \
               libgtk-3-dev
diff --git a/check_script.sh b/check_script.sh
index de350fc..24f2412 100755
--- a/check_script.sh
+++ b/check_script.sh
@@ -63,5 +63,12 @@ case $shebang  in
     ;;
     ("#!/usr/bin/make") ;;
     ("#!/bin/sed") ;;
-    (*) printf '%s\n' "unknown shebang $shebang in file $1" ;;
+    (*)
+        printf '%s\n' "file $1 is executable, but should it be?"
+        printf '%s\n' "if it's a script, then its shebang"
+        printf '%s\n' "  $shebang"
+        printf '%s\n' "is unknown; otherwise, consider running"
+        printf '%s\n' "  chmod -x $1"
+        printf '%s\n' "to remove the executable bit"
+    ;;
 esac
diff --git a/gwc/.zshrc b/gwc/.zshrc
index ba919aa..9a27c2a 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -109,6 +109,9 @@ HISTFILE=~/.history
 setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 
+# Don't kill session if Ctrl-D hit by accident.
+setopt IGNORE_EOF
+
 # Get rid of silly redhat defaults like their 1400-char $LS_COLORS.
 unset HISTCONTROL
 unset KDEDIRS
diff --git a/install_xml_libraries.sh b/install_xml_libraries.sh
index 0a7b5cc..3380e82 100755
--- a/install_xml_libraries.sh
+++ b/install_xml_libraries.sh
@@ -183,7 +183,7 @@ fi
 
 # This forestalls about a thousand lines of bogus error messages.
 
-throwaway_catalog=/etc/opt/lmi/xml_catalog
+throwaway_catalog=/tmp/xml_catalog
 
 cat >"$throwaway_catalog" <<EOF
 <?xml version="1.0"?>
diff --git a/irc7702_interest.cpp b/irc7702_interest.cpp
index c3e8ee3..4595dde 100644
--- a/irc7702_interest.cpp
+++ b/irc7702_interest.cpp
@@ -1,4 +1,4 @@
-// 7702 (and 7702A) interest rate.
+// 7702 (and 7702A) interest rates.
 //
 // Copyright (C) 2020, 2021 Gregory W. Chicares.
 //
diff --git a/irc7702_interest.hpp b/irc7702_interest.hpp
index 2c210d4..e59e553 100644
--- a/irc7702_interest.hpp
+++ b/irc7702_interest.hpp
@@ -1,4 +1,4 @@
-// 7702 (and 7702A) interest rate.
+// 7702 (and 7702A) interest rates.
 //
 // Copyright (C) 2020, 2021 Gregory W. Chicares.
 //
diff --git a/version.hpp b/version.hpp
index bd96182..4130e83 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020, 2021 Gregory W. Chicares.
+// Copyright (C) 2021 Gregory W. Chicares.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -22,6 +22,6 @@
 
 #include "config.hpp"
 
-#define LMI_VERSION "20201201T2250Z"
+#define LMI_VERSION "20210102T2216Z"
 
 #endif // version_hpp