Commit 70c21b47 authored by Jondy Zhao's avatar Jondy Zhao

fix typos

modified:   scripts/slapos-configure.sh
modified:   scripts/slapos-include.sh
parent 38c73b32
...@@ -421,7 +421,7 @@ function configure_section_openvpn() ...@@ -421,7 +421,7 @@ function configure_section_openvpn()
csih_inform "copy /opt/openvpn/re6st/${name}.exe to ${_path}" csih_inform "copy /opt/openvpn/re6st/${name}.exe to ${_path}"
cp /opt/openvpn/re6st/${name}.exe ${_path} ||csih_error "No available ovpn scripts: ${name}" cp /opt/openvpn/re6st/${name}.exe ${_path} ||csih_error "No available ovpn scripts: ${name}"
fi done
# Install re6stnet service if no native ipv6 # Install re6stnet service if no native ipv6
if ! cygrunsrv --query ${re6stnet_service_name} >/dev/null 2>&1 ; then if ! cygrunsrv --query ${re6stnet_service_name} >/dev/null 2>&1 ; then
...@@ -548,7 +548,7 @@ readonly -f configure_section_test_agent ...@@ -548,7 +548,7 @@ readonly -f configure_section_test_agent
function remove_configure_items() function remove_configure_items()
{ {
if [[ "${_configure_sections}" == *_client_* ]] then if [[ "${_configure_sections}" == *_client_* ]] ; then
csih_inform "Removing section client ..." csih_inform "Removing section client ..."
csih_inform "Remove ${client_configure_file}" csih_inform "Remove ${client_configure_file}"
...@@ -563,7 +563,7 @@ function remove_configure_items() ...@@ -563,7 +563,7 @@ function remove_configure_items()
csih_inform "Remove section client OK" csih_inform "Remove section client OK"
fi fi
if [[ "${_configure_sections}" == *_cron_* ]] then if [[ "${_configure_sections}" == *_cron_* ]] ; then
csih_inform "Removing section cron ..." csih_inform "Removing section cron ..."
csih_inform "Remove service ${cron_service_name}" csih_inform "Remove service ${cron_service_name}"
...@@ -576,12 +576,12 @@ function remove_configure_items() ...@@ -576,12 +576,12 @@ function remove_configure_items()
csih_inform "Remove section cron OK" csih_inform "Remove section cron OK"
fi fi
if [[ "${_configure_sections}" == *_network_* ]] then if [[ "${_configure_sections}" == *_network_* ]] ; then
csih_inform "Removing network ${slapos_ifname ..." csih_inform "Removing network ${slapos_ifname} ..."
ipwin remove *msloop ${slapos_ifname} && echo "OK" ipwin remove *msloop ${slapos_ifname} && echo "OK"
fi fi
if [[ "${_configure_sections}" == *_node_* ]] then if [[ "${_configure_sections}" == *_node_* ]] ; then
csih_inform "Removing section node ..." csih_inform "Removing section node ..."
csih_inform "Remove ${node_configure_file}" csih_inform "Remove ${node_configure_file}"
...@@ -596,7 +596,7 @@ function remove_configure_items() ...@@ -596,7 +596,7 @@ function remove_configure_items()
csih_inform "Remove section node OK" csih_inform "Remove section node OK"
fi fi
if [[ "${_configure_sections}" == *_re6stnet_* ]] then if [[ "${_configure_sections}" == *_re6stnet_* ]] ; then
csih_inform "Removing section re6stnet ..." csih_inform "Removing section re6stnet ..."
csih_inform "Remove /opt/miniupnpc" csih_inform "Remove /opt/miniupnpc"
...@@ -609,7 +609,7 @@ function remove_configure_items() ...@@ -609,7 +609,7 @@ function remove_configure_items()
csih_inform "Remove section re6stnet OK" csih_inform "Remove section re6stnet OK"
fi fi
if [[ "${_configure_sections}" == *_openvpn_* ]] then if [[ "${_configure_sections}" == *_openvpn_* ]] ; then
csih_inform "Removing section openvpn ..." csih_inform "Removing section openvpn ..."
csih_inform "Remove service ${re6stnet_service_name}" csih_inform "Remove service ${re6stnet_service_name}"
...@@ -624,10 +624,12 @@ function remove_configure_items() ...@@ -624,10 +624,12 @@ function remove_configure_items()
csih_inform "Remove section openvpn OK" csih_inform "Remove section openvpn OK"
fi fi
if [[ "${_configure_sections}" == *_slap-runner_* ]] then if [[ "${_configure_sections}" == *_slap-runner_* ]] ; then
csih_inform "Remove section slap-runner"
fi fi
if [[ "${_configure_sections}" == *_test-agent_* ]] then if [[ "${_configure_sections}" == *_test-agent_* ]] ; then
csih_inform "Remove section test-agent"
fi fi
} }
readonly -f remove_configure_items readonly -f remove_configure_items
......
...@@ -266,7 +266,7 @@ function slapos_wget_file() ...@@ -266,7 +266,7 @@ function slapos_wget_file()
wget $1 -O $2 || return 1 wget $1 -O $2 || return 1
csih_inform "Got $2." csih_inform "Got $2."
} # === wget_slapos_file() === # } # === wget_slapos_file() === #
readonly -f wget_slapos_file readonly -f slapos_wget_file
# ====================================================================== # ======================================================================
# Routine: slapos_create_privileged_user # Routine: slapos_create_privileged_user
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment