Git commit 5d7dcacee6fd89feae01f197e278f61a1ddead8b by Andrew Shark.
Committed on 15/02/2024 at 11:44.
Pushed by ashark into branch 'master'.
Remove update-shellrc step
It basically just added to the shellrc the path to the running script. That is
not handled correctly in all cases.
Also, it tried to add kdesrc-run bash autocompletion, but the code was not
handling all cases correctly anyway.
Instead, we will offer to install the file in the correct place in the first
place.
Regarding PATH, that should be in user's control.
M +1-1README.md
M +0-1completions/zsh/_kdesrc-build
M +1-13 doc/man-kdesrc-build.1.docbook
M +1-12 doc/supported-cmdline-params.docbook
M +0-4kdesrc-build
M +3-4modules/ksb/Cmdline.pm
M +0-78 modules/ksb/FirstRun.pm
M +0-1scripts/gen_zsh_completions.py
https://invent.kde.org/sdk/kdesrc-build/-/commit/5d7dcacee6fd89feae01f197e278f61a1ddead8b
diff --git a/README.md b/README.md
index c4aaa3fb..c95e6d8b 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ $ kdesrc-build --initial-setup
```
This will install the distribution packages dependencies required by
`kdesrc-build`,
-generate a configuration file, and add itself to your path for convenience.
+generate a configuration file.
### Download the KDE project and dependency data:
diff --git a/completions/zsh/_kdesrc-build b/completions/zsh/_kdesrc-build
index 8dccee6f..ce83af68 100644
--- a/completions/zsh/_kdesrc-build
+++ b/completions/zsh/_kdesrc-build
@@ -78,7 +78,6 @@ _arguments \
"(--stop-on-failure
--no-stop-on-failure)"{--stop-on-failure,--no-stop-on-failure}"[Stops/Does not
stop the build as soon as a package fails to build]" \
"--tag""[Download a specific release of a module]"":argument:" \
"--uninstall""[Uninstalls the module]" \
- "--update-shellrc""[Installs Plasma env vars (~/.bashrc)]" \
"(--use-clean-install
--no-use-clean-install)"{--use-clean-install,--no-use-clean-install}"[Run make
uninstall directly before running make install]" \
"(--use-idle-io-priority
--no-use-idle-io-priority)"{--use-idle-io-priority,--no-use-idle-io-priority} \
"(--use-inactive-modules
--no-use-inactive-modules)"{--use-inactive-modules,--no-use-inactive-modules}"[Allow
kdesrc-build to also clone and pull from repositories marked as inactive]" \
diff --git a/doc/man-kdesrc-build.1.docbook b/doc/man-kdesrc-build.1.docbook
index 352da7ff..f97209c9 100644
--- a/doc/man-kdesrc-build.1.docbook
+++ b/doc/man-kdesrc-build.1.docbook
@@ -130,7 +130,7 @@ combining short options into one at this point. (E.g.
running
default configuration file setup, and changes to your ~/.bashrc to make the
software installed by accessible.
-This is exactly equivalent to using "--install-distro-packages
--generate-config --update-shellrc" at the same time.
+This is exactly equivalent to using "--install-distro-packages
--generate-config" at the same time.
@@ -160,18 +160,6 @@ Generate the configuration file.
-
-
---update-shellrc
-
-
-
-
-Edit the "~/.bashrc" (or other shell rc file) to add to your
$PATH variable and enable autocompletion.
-
-
-
-
-p, --pretend
diff --git a/doc/supported-cmdline-params.docbook
b/doc/supported-cmdline-params.docbook
index c3202192..a6d1a9aa 100644
--- a/doc/supported-cmdline-params.docbook
+++ b/doc/supported-cmdline-params.docbook
@@ -564,12 +564,11 @@ software to run.
Installing known dependencies (on supported
distributions)
Adding required environment variables to
~/.bashrc
-Setting up a configuration
file
This option is exactly equivalent to using
--install-distro-packages
--generate-config
---update-shellrc at the same
time.
+at the same time.
@@ -593,16 +592,6 @@ Generate the configuration file.
-
---update-shellrc
-
-Edit the "~/.bashrc" (or other shell rc file) to add to your
$PATH variable and enable autocompletion.
-
-See also --initial-setup
-
-
-
-
diff --git a/kdesrc-build b/kdesrc-build
index 9caeb9cb..1db44550 100755
--- a/kdesrc-build
+++ b/kdesrc-build
@@ -91,7 +91,6 @@ eval {
if (grep { $_ eq "--initial-setup" } @ARGV) {
push @setup_steps, "install-distro-packages";
push @setup_steps, "generate-config";
-push @setup_steps, "update-shellrc";
} else {
if (grep {$_ eq "--install-distro-packages"} @ARGV) {
push @setup_steps, "install-distro-packages";
@@ -99,9 +98,6 @@ eval {
if (grep {$_ eq "--generate-config"} @ARGV) {
push @setup_steps, "generate-config";
}
-if (grep {$_ eq "--update-shellrc"} @ARGV) {
-push @setup_steps, "update-shellrc";
-}
}
if (@setup_steps) {
diff --git a/modules/ksb/Cmdline.pm b/modules/ksb/Cmdline.pm
index 933a82fd..a7d6e51b 100644
--- a/modules/ksb/Cmdline.pm
+++ b/modules/ksb/Cmdline.pm
@@ -343,8 +343,7 @@ sub _showHelpAndExit
--refresh-build
