update some files missed in rebase

ElektraInitiative · Oct 2, 2020 · e59e9a5 · e59e9a5
1 parent d0102d7
commit e59e9a5
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 164 deletions.
diff --git a/doc/help/kdb-export.md b/doc/help/kdb-export.md
@@ -49,8 +49,8 @@ To view your full key database in Elektra’s `storage` format:<br>
 To backup your full key database in Elektra’s `storage` format to a file called `full-backup.ecf`:<br>
 `kdb export / > full-backup.ecf`<br>
 
-To backup a keyset stored in `user/keyset` in the `ini` format to a file called `keyset.ini`:<br>
-`kdb export user/keyset ini > keyset.ini`<br>
+To backup a keyset stored in `user:/keyset` in the `ini` format to a file called `keyset.ini`:<br>
+`kdb export user:/keyset ini > keyset.ini`<br>
 
 Change default format to `simpleini`:<br>
 `kdb set /sw/elektra/kdb/#0/current/format simpleini`

diff --git a/doc/man/man1/kdb-export.1 b/doc/man/man1/kdb-export.1
@@ -89,7 +89,7 @@ To backup your full key database in Elektra’s \fBstorage\fR format to a file c
 .br
 .
 .P
-To backup a keyset stored in \fBuser/keyset\fR in the \fBini\fR format to a file called \fBkeyset\.ini\fR:
+To backup a keyset stored in \fBuser:/keyset\fR in the \fBini\fR format to a file called \fBkeyset\.ini\fR:
 .
 .br
 \fBkdb export user:/keyset ini > keyset\.ini\fR

diff --git a/doc/man/man1/kdb-global-umount.1 b/doc/man/man1/kdb-global-umount.1
@@ -34,7 +34,7 @@ Print never/auto(default)/always colored output\.
 .
 .nf
 
-# Backup\-and\-Restore: system:/elektra/globalplugins
+if [ \-f "$(kdb file system:/elektra/globalplugins)" ]; then mv "$(kdb file system:/elektra/globalplugins)" "globalplugins\.bak"; else touch "globalplugins\.rm"; fi
 
 sudo kdb global\-mount tracer
 
@@ -51,6 +51,8 @@ sudo kdb global\-umount spec
 
 sudo kdb global\-mount
 #>
+
+if [ \-f "globalplugins\.rm" ]; then rm "$(kdb file system:/elektra/globalplugins)" "globalplugins\.rm"; else mv "globalplugins\.bak" "$(kdb file system:/elektra/globalplugins)"; fi
 .
 .fi
 .

diff --git a/doc/todo/RELEASE b/doc/todo/RELEASE
@@ -130,7 +130,7 @@ commands below work for copy&paste:
 == Prepare Source Package ==
 
 Build tar.gz:
- export KDB_VERSION=`kdb get system/elektra/version/constants/KDB_VERSION`
+ export KDB_VERSION=`kdb get system:/elektra/version/constants/KDB_VERSION`
  # CMAKE_BINARY_DIR not working on my machine?
  export CMAKE_BINARY_DIR=/home/mpranj/workspace/libelektra/build
  cd ~build && make source-package

diff --git a/doc/tutorials/storage-plugins.md b/doc/tutorials/storage-plugins.md
@@ -175,7 +175,7 @@ user:/tests/storage/map/#0
 user:/tests/storage/map/#1
 ```
 
-. If we assume that only `user/tests/storage/array` stores the metakey `array`, then the keys
+. If we assume that only `user:/tests/storage/array` stores the metakey `array`, then the keys
 
 - `user:/tests/storage/array/#0`, and
 - `user:/tests/storage/array/#1`

diff --git a/src/bindings/swig/python/examples/example_gopts.py b/src/bindings/swig/python/examples/example_gopts.py
@@ -88,8 +88,8 @@ def get_python_interpreter_arguments():
 with kdb.KDB() as db:
 	error_key = kdb.Key(spec_base_key)
 	rc = db.ensure(kdb.KeySet(2,
-			kdb.Key("system/elektra/ensure/plugins/global/gopts", kdb.KEY_VALUE, "remount"), 
-			kdb.Key("system/elektra/ensure/plugins/global/gopts/config/offset", kdb.KEY_VALUE, str(argv_offset))
+			kdb.Key("system:/elektra/ensure/plugins/global/gopts", kdb.KEY_VALUE, "remount"), 
+			kdb.Key("system:/elektra/ensure/plugins/global/gopts/config/offset", kdb.KEY_VALUE, str(argv_offset))
 			), error_key)
 	if rc == 1:
 		print("ERROR: Contract could not be ensured!\n", error_key.getMeta("error/reason").value, file=sys.stderr)

diff --git a/src/libs/elektra/kdbenum.c b/src/libs/elektra/kdbenum.c
@@ -15,7 +15,7 @@
   * The version information in x.y.z format as string.
   *
   * To get the version at run-time, you can get the key
-  * system/elektra/version/constants/KDB_VERSION
+  * system:/elektra/version/constants/KDB_VERSION
   *
   * @see [VERSION.md](/doc/VERSION.md).
   * @see #KDB_VERSION_MAJOR
@@ -29,7 +29,7 @@
   * The version information of the major version as number.
   *
   * To get the version at run-time, you can get the key
-  * system/elektra/version/constants/KDB_VERSION_MAJOR
+  * system:/elektra/version/constants/KDB_VERSION_MAJOR
   *
   * @see [VERSION.md](/doc/VERSION.md).
   * @see #KDB_VERSION
@@ -41,7 +41,7 @@
   * The version information of the minor version as number.
   *
   * To get the version at run-time, you can get the key
-  * system/elektra/version/constants/KDB_VERSION_MINOR
+  * system:/elektra/version/constants/KDB_VERSION_MINOR
   *
   * @see [VERSION.md](/doc/VERSION.md).
   * @see #KDB_VERSION
@@ -53,7 +53,7 @@
   * The version information of the patch version as number.
   *
   * To get the version at run-time, you can get the key
-  * system/elektra/version/constants/KDB_VERSION_PATCH
+  * system:/elektra/version/constants/KDB_VERSION_PATCH
   *
   * @see [VERSION.md](/doc/VERSION.md).
   * @see #KDB_VERSION

diff --git a/src/plugins/kconfig/kconfig_serializer.hpp b/src/plugins/kconfig/kconfig_serializer.hpp
@@ -70,7 +70,7 @@ class KConfigSerializer
 
 	/**
 	 * @brief This method is used to extract a group name of a full path.
-	 * E.g. given `system/group/subgroup/key.name` it returns `system/group/subgroup`
+	 * E.g. given `system:/group/subgroup/key.name` it returns `system:/group/subgroup`
 	 * @param leafKeyName This string contains the full path
 	 * @return This string contains the group name
 	 */
@@ -101,7 +101,7 @@ class KConfigSerializer::KeyNameComparator
 
 	/**
 	 * @brief This method will skip the common prefix that a key has with the parent key.
-	 * If the given iterator points to a key name `system/group/subgroup/key.name` and the parentKeyCount is 2, after this method is
+	 * If the given iterator points to a key name `system:/group/subgroup/key.name` and the parentKeyCount is 2, after this method is
 	 * executed the iterator will point to e key name `subgroup/key.name`
 	 *
 	 * @param it This CppKey::iterator contains the key that we are skipping