[sdk/kdesrc-build] /: Merge remote-tracking branch 'verahawk/xdg_spec'

[Michael Pyne]

Git commit 989cf8e9f56c38ebbc01dae14cae6482285ae774 by Michael Pyne.
Committed on 22/01/2022 at 23:35.
Pushed by mpyne into branch 'master'.

Merge remote-tracking branch 'verahawk/xdg_spec'

Implements MR !122

Conflicts:
	kdesrc-build

M  +42   -29   doc/index.docbook
M  +12   -4    kdesrc-build
M  +31   -24   kdesrc-build-setup
M  +17   -3    modules/ksb/Application.pm
M  +64   -25   modules/ksb/BuildContext.pm
M  +11   -5    modules/ksb/FirstRun.pm
M  +2    -2    modules/ksb/Module.pm

https://invent.kde.org/sdk/kdesrc-build/commit/989cf8e9f56c38ebbc01dae14cae6482285ae774

diff --cc kdesrc-build
index f6978fa,d804dab..8b23080
--- a/kdesrc-build
+++ b/kdesrc-build
@@@ -117,25 -121,26 +118,32 @@@ eval 
  };
  
  if ($@) {
 -    dumpError();
      say STDERR <<DONE;
  Couldn't load the base platform for kdesrc-build!
 -More detail might be available in error-$$.log
 +
 +$@
  DONE
  
-     if (! -e "kdesrc-buildrc" && ! -e "$ENV{HOME}/.kdesrc-buildrc") {
+     # According to XDG spec, if $XDG_CONFIG_HOME is not set, then we should default
+     # to ~/.config
+     my $xdgConfigHome = $ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config";
+     my @possibleConfigPaths = ("./kdesrc-buildrc",
+                                "$xdgConfigHome/kdesrc-buildrc",
+                                "$ENV{HOME}/.kdesrc-buildrc");
+ 
+     if (!grep { -e $_ } (@possibleConfigPaths)) {
 -        say STDERR <<DONE;
 -It appears you've not run kdesrc-build before.
 -
 -Please run "kdesrc-build --initial-setup" and kdesrc-build will guide you
 -through setting up required dependencies and environment setup.
 -DONE
 +        say STDERR <<~DONE;
 +        It appears you've not run kdesrc-build before.
 +
 +        Please run "kdesrc-build --initial-setup" and kdesrc-build will guide you
 +        through setting up required dependencies and environment setup.
 +        DONE
 +    } else {
 +        say STDERR <<~DONE;
 +        You could:
 +         File a bug https://bugs.kde.org/enter_bug.cgi?product=kdesrc-build
 +         Ask for help on irc.libera.chat in the #kde channel
 +        DONE
      }
      exit 1;
  }