Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 net/wpa_supplicant/HISTORY |    3 +++
 net/wpa_supplicant/INSTALL |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 029c9b3fe4c1c4e4001c3a9eb0b56146429f2bf3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/wpa_supplicant: fix error in INSTALL

diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 6b1d3fe..efb96af 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2020-01-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * INSTALL: fix error due to missing file
+
 2019-10-15 Pavel Vinogradov <public AT sourcemage.org>
        * BUILD, CONFIGURE: added interface matching option
 
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 4f98d04..6f70572 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -31,13 +31,13 @@ if is_depends_enabled $SPELL dbus; then
     install -Tvm 644 dbus-wpa_supplicant.service "$DBUS_FILE" &&
     install_config_file dbus-wpa_supplicant.conf 
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
   else
-    install -Tvm 644 dbus/fi.epitest.hostap.WPASupplicant.service 
"$DBUS_FILE" &&
     install -Tvm 644 dbus/fi.w1.wpa_supplicant1.service "$DBUS_FILE2" &&
     install_config_file dbus/dbus-wpa_supplicant.conf 
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
   fi
 fi &&
 
-if [[ $WPA_CONFIG_FILE == y ]] || list_find "$INIT_INSTALLED" 
wpa_supplicant; then
+if [[ ! -f "$INSTALL_ROOT/etc/wpa_supplicant.conf" ]] && \
+       ( [[ $WPA_CONFIG_FILE == y ]] || list_find "$INIT_INSTALLED" 
wpa_supplicant ); then
   install_config_file "$SPELL_DIRECTORY/wpa_supplicant.conf" \
                       "$INSTALL_ROOT/etc/wpa_supplicant.conf"
 fi