WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved some functions to ofunctions.sh

This commit is contained in:
deajan 2017-02-07 22:05:27 +01:00
parent c1ca28bd41
commit a186964bc8
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dev/tests/run_tests.sh
View File

@ -7,7 +7,7 @@
## On CYGWIN / MSYS, ACL and extended attributes aren't supported ## On CYGWIN / MSYS, ACL and extended attributes aren't supported
# osync test suite 2017020701 # osync test suite 2017020702
# 4 tests: # 4 tests:
# quicklocal # quicklocal
@ -74,34 +74,36 @@ OSYNC_IS_STABLE=maybe
# Setup an array with all function modes # Setup an array with all function modes
#declare -Ag osyncParameters #declare -Ag osyncParameters
function GetConfFileValue () {
local file="${1}"
local name="${2}"
local value
value=$(grep "^$name=" "$file") ## Moved to ofunctions.sh
if [ $? == 0 ]; then #function GetConfFileValue () {
value="${value##*=}" # local file="${1}"
echo "$value" # local name="${2}"
else # local value
assertEquals "$name does not exist in [$file]." "1" "0" #
fi # value=$(grep "^$name=" "$file")
} # if [ $? == 0 ]; then
# value="${value##*=}"
# echo "$value"
# else
# assertEquals "$name does not exist in [$file]." "1" "0"
# fi
#}
function SetConfFileValue () { #function SetConfFileValue () {
local file="${1}" # local file="${1}"
local name="${2}" # local name="${2}"
local value="${3}" # local value="${3}"
#
if grep "^$name=" "$file" > /dev/null; then # if grep "^$name=" "$file" > /dev/null; then
# Using -i.tmp for BSD compat # # Using -i.tmp for BSD compat
sed -i.tmp "s/^$name=.*/$name=$value/" "$file" # sed -i.tmp "s/^$name=.*/$name=$value/" "$file"
rm -f "$file.tmp" # rm -f "$file.tmp"
assertEquals "Set $name to [$value]." "0" $? # assertEquals "Set $name to [$value]." "0" $?
else # else
assertEquals "$name does not exist in [$file]." "1" "0" # assertEquals "$name does not exist in [$file]." "1" "0"
fi # fi
} #}
function SetupSSH { function SetupSSH {
echo -e 'y\n'| ssh-keygen -t rsa -b 2048 -N "" -f "${HOME}/.ssh/id_rsa_local" echo -e 'y\n'| ssh-keygen -t rsa -b 2048 -N "" -f "${HOME}/.ssh/id_rsa_local"