Skip to content

Commit 0ef35c3

Browse files
Markus Raabsanssecours
Markus Raab
authored andcommitted
rename run_env
1 parent de0274e commit 0ef35c3

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

Diff for: doc/TESTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ top-level of Elektra's source code:
111111

112112
```
113113
cd build
114-
. ../scripts/run_dev_env
114+
. ../scripts/dev/run_env
115115
```
116116

117-
After sourcing `run_dev_env`, you can directly execute `kdb` and other
117+
After sourcing `run_env`, you can directly execute `kdb` and other
118118
binaries built with Elektra (such as the examples).
119119

120120
## Recommended Environment

Diff for: doc/news/2018-05-13_0.8.23.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ plugins, bindings and tools are always up to date. Furthermore, we changed:
223223

224224
These notes are of interest for people developing Elektra:
225225

226-
- `. run_dev_env` is a script to be sourced from the build directory.
226+
- `. run_env` is a script to be sourced from the build directory.
227227
It sets environment variables, so that Elektra from the build
228228
directory is used (instead of the installed one).
229229
- All current versions of Clang-Format (6.0+) and the outdated Clang-Format 5 will now produce exactly the same output for the whole codebase,

Diff for: doc/news/_preparation_next_release.md

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ you up to date with the multi-language support provided by Elektra.
236236
- `example-xorg`. _(Markus Raab)_
237237

238238
- The script [run_icheck](../../scripts/build/run_icheck) now also work correctly, if the last entry of [`icheck.suppression`](../../tests/icheck.suppression) does not end with a newline character. _(René Schwaiger)_
239+
- Renamed `scripts/run_dev_env` to `scripts/dev/run_env`. _(Markus Raab)_
239240
- The script [`draw-all-plugins`](../../scripts/dev/draw-all-plugins) now also works properly, if the repository path contains space characters. _(René Schwaiger)_
240241
- The script [`link-checker`](../../scripts/link-checker) now deduplicates the list of links before checking them. The timeout and amount of retries was also reduced.
241242
Lastly the script now supports a whitelist. Any link stored in [`tests/linkchecker.whitelist`](../../tests/linkchecker.whitelist) will not be checked. _(Klemens Böswirth)_

Diff for: doc/tutorials/contributing-clion.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ If you want to run built `kdb` outside of CLion, the recommended way is to run t
297297
Example:
298298

299299
```sh
300-
. /PATH/TO/YOUR/PROJECT/scripts/run_dev_env
300+
. /PATH/TO/YOUR/PROJECT/scripts/dev/run_env
301301
```
302302

303303
Please keep in mind it sets the variables only in the currently opened shell window/session.

Diff for: scripts/run_dev_env renamed to scripts/dev/run_env

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ if [ ! -f CMakeCache.txt ]
22
then
33
echo "You must be within the build folder before you source this script"
44
echo
5-
echo "Usage: cd build && source run_dev_env"
5+
echo "Usage: cd build && source ../scripts/dev/run_env"
66
return
77
fi
88

99

1010
# common configure script
1111
ELEKTRA_DIR=`grep "^Elektra_SOURCE_DIR" CMakeCache.txt | cut -f 2 -d "="`
12-
export SCRIPTS_DIR="${ELEKTRA_DIR}/scripts"
12+
export SCRIPTS_DIR="${ELEKTRA_DIR}/scripts/dev"
1313
. "${SCRIPTS_DIR}/include-common"
1414

1515
BUILD=`pwd`

Diff for: src/bindings/rust/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To build the bindings explicitly as part of the elektra build process, we add th
3434

3535
## Example
3636

37-
Note that your dynamic linker must be able to find `libelektra-{core,meta,kdb}`. If you just compiled it, you can run `source ../scripts/run_dev_env` from the `build` directory to modify your `PATH` appropriately.
37+
Note that your dynamic linker must be able to find `libelektra-{core,meta,kdb}`. If you just compiled it, you can run `source ../scripts/dev/run_env` from the `build` directory to modify your `PATH` appropriately.
3838

3939
See the `example` directory for a fully setup project. To run it, change directories into `build/src/bindings/rust/example/` and run `cargo run --bin key`.
4040

Diff for: tests/shell/check_bashisms.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ scripts=$(
2727
-path '*kdb_zsh_completion' -or \
2828
-path '*kdb-zsh-noglob' -or \
2929
-path '*reformat-source' -or \
30-
-path '*run_dev_env' -or \
30+
-path '*run_env' -or \
3131
-path '*sed' -or \
3232
-path '*update-infos-status' -or \
3333
-path '*zsh' -or \

Diff for: tests/shell/shell_recorder/tutorial_wrapper/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ This feature requires you to use either use
140140

141141
```bash
142142
cd build
143-
. ~e/scripts/run_dev_env
143+
. ~e/scripts/dev/run_env
144144
tests/shell/shell_recorder/tutorial_wrapper/markdown_shell_recorder.sh path/to/file.md
145145
```
146146

0 commit comments

Comments
 (0)