[sdk/kdesrc-build] /: Move xsession.sh and kde-env-master.sh templates to data

[Andrew Shark]

Git commit beffd6a8d7250ffab6307bf1492c6ef751bbd3bb by Andrew Shark.
Committed on 12/12/2023 at 11:04.
Pushed by ashark into branch 'master'.

Move xsession.sh and kde-env-master.sh templates to data

M  +2    -2    CMakeLists.txt
R  +0    -0    data/kde-env-master.sh.in [from: sample-kde-env-master.sh - 100% similarity]
R  +0    -0    data/xsession.sh.in [from: sample-xsession.sh - 100% similarity]
M  +2    -2    doc/index.docbook
M  +2    -2    modules/ksb/Application.pm

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81097ec8..dd8db97b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,8 @@ install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kdesrc-build DESTINATION ${KDE_INST
 install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kdesrc-run DESTINATION ${KDE_INSTALL_BINDIR})
 
 install(PROGRAMS
-            ${CMAKE_SOURCE_DIR}/sample-kde-env-master.sh
-            ${CMAKE_SOURCE_DIR}/sample-xsession.sh
+            ${CMAKE_SOURCE_DIR}/data/kde-env-master.sh.in
+            ${CMAKE_SOURCE_DIR}/data/xsession.sh.in
             ${CMAKE_SOURCE_DIR}/data/build-include/custom-qt5-libs.ksb
             ${CMAKE_SOURCE_DIR}/data/build-include/qt5.ksb
             ${CMAKE_SOURCE_DIR}/data/build-include/kf5-applications.ksb
diff --git a/sample-kde-env-master.sh b/data/kde-env-master.sh.in
similarity index 100%
rename from sample-kde-env-master.sh
rename to data/kde-env-master.sh.in
diff --git a/sample-xsession.sh b/data/xsession.sh.in
similarity index 100%
rename from sample-xsession.sh
rename to data/xsession.sh.in
diff --git a/doc/index.docbook b/doc/index.docbook
index b4c2937a..6a4a383d 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -857,7 +857,7 @@ instructions have been moved to an appendix (<xref
 linkend="old-profile-setup"/>).</para>
 
 <para>If you intend to setup your own login support you can consult that
-appendix or view the <filename>sample-kde-env-master.sh</filename> file
+appendix or view the <filename>kde-env-master.sh.in</filename> file
 included with the &kdesrc-build; source.</para>
 
 </sect2>
@@ -4940,7 +4940,7 @@ will normally try to do this automatically (see <xref
 linkend="session-driver"/>). This appendix section can be useful for those who
 cannot use &kdesrc-build;'s support for login profile setup. However the
 instructions may not always be up-to-date, it can also be useful to consult the
-<filename>kde-env-master.sh</filename> file included with the &kdesrc-build;
+<filename>kde-env-master.sh.in</filename> file included with the &kdesrc-build;
 source.</para>
 
 <sect2 id="changing-profile">
diff --git a/modules/ksb/Application.pm b/modules/ksb/Application.pm
index 1fe20e32..a4b895a6 100644
--- a/modules/ksb/Application.pm
+++ b/modules/ksb/Application.pm
@@ -1771,10 +1771,10 @@ sub _installCustomSessionDriver
     s{//+}{/}g foreach @searchPaths; # Remove duplicate slashes
 
     my $envScript = first { -f $_ } (
-        map { "$_/sample-kde-env-master.sh" } @searchPaths
+        map { "$_/data/kde-env-master.sh.in" } @searchPaths
     );
     my $sessionScript = first { -f $_ } (
-        map { "$_/sample-xsession.sh" } @searchPaths
+        map { "$_/data/xsession.sh.in" } @searchPaths
     );
 
     if (!$envScript || !$sessionScript) {