scripts REFACTOR simplify based on sr updates

CESNET · Sep 18, 2023 · 0f29193 · 0f29193
1 parent b51ae42
commit 0f29193
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,8 +59,8 @@ set(LIBNETCONF2_DEP_SOVERSION 3.5.3)
 set(LIBNETCONF2_DEP_SOVERSION_MAJOR 3)
 
 # sysrepo required version
-set(SYSREPO_DEP_VERSION 2.2.95)
-set(SYSREPO_DEP_SOVERSION 7.18.0)
+set(SYSREPO_DEP_VERSION 2.2.111)
+set(SYSREPO_DEP_SOVERSION 7.19.7)
 set(SYSREPO_DEP_SOVERSION_MAJOR 7)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99")

diff --git a/scripts/merge_config.sh b/scripts/merge_config.sh
@@ -52,12 +52,9 @@ CONFIG="<netconf-server xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-server\
         </endpoint>
     </listen>
 </netconf-server>"
-TMPFILE=`mktemp -u`
-printf -- "$CONFIG" > $TMPFILE
+
 # apply it to startup and running
-$SYSREPOCFG --edit=$TMPFILE -d startup -f xml -m ietf-netconf-server -v2
+echo "$CONFIG" | $SYSREPOCFG --edit -d startup -f xml -m ietf-netconf-server -v2
 $SYSREPOCFG -C startup -m ietf-netconf-server -v2
-# remove the tmp file
-rm $TMPFILE
 
 fi
diff --git a/scripts/merge_hostkey.sh b/scripts/merge_hostkey.sh
@@ -45,12 +45,9 @@ CONFIG="<keystore xmlns=\"urn:ietf:params:xml:ns:yang:ietf-keystore\">
         </asymmetric-key>
     </asymmetric-keys>
 </keystore>"
-TMPFILE=`mktemp -u`
-printf -- "$CONFIG" > $TMPFILE
+
 # apply it to startup and running
-$SYSREPOCFG --edit=$TMPFILE -d startup -f xml -m ietf-keystore -v2
+echo "$CONFIG" | $SYSREPOCFG --edit -d startup -f xml -m ietf-keystore -v2
 $SYSREPOCFG -C startup -m ietf-keystore -v2
-# remove the tmp file
-rm $TMPFILE
 
 fi