Commit 0d0f797f authored by Jondy Zhao's avatar Jondy Zhao

Prefect output of slapos-cygwin-bootstrap

parent 22433a00
...@@ -115,12 +115,12 @@ function slapos_patch_cygwin() ...@@ -115,12 +115,12 @@ function slapos_patch_cygwin()
# Change format of readme.txt # Change format of readme.txt
_filename=$(cygpath -u $(cygpath -m /)/../readme.txt) _filename=$(cygpath -u $(cygpath -m /)/../readme.txt)
if [[ -f ${_filename} ]] ; then if [[ -f ${_filename} ]] ; then
echo "Changing $(cygpath -w ${_filename}) as dos format ..." csih_inform "Changing $(cygpath -w ${_filename}) as dos format ..."
unix2dos ${_filename} && echo OK. unix2dos ${_filename} && csih_inform "OK."
fi fi
_filename=~/.minttyrc _filename=~/.minttyrc
echo Checking ${_filename} ... csih_inform "Checking ${_filename} ..."
if [[ ! -f ${_filename} ]] ; then if [[ ! -f ${_filename} ]] ; then
cat <<EOF > ${_filename} cat <<EOF > ${_filename}
BoldAsFont=no BoldAsFont=no
...@@ -128,13 +128,13 @@ Font=Courier New ...@@ -128,13 +128,13 @@ Font=Courier New
FontHeight=16 FontHeight=16
Scrollbar=none Scrollbar=none
EOF EOF
echo "${_filename} has been generated." csih_inform "${_filename} has been generated."
else else
echo OK. csih_inform "OK."
fi fi
_filename="/cygtty.bat" _filename="/cygtty.bat"
echo Checking ${_filename} ... csih_inform "Checking ${_filename} ..."
if [[ ! -x ${_filename} ]] ; then if [[ ! -x ${_filename} ]] ; then
cat <<EOF > ${_filename} cat <<EOF > ${_filename}
@echo off @echo off
...@@ -145,13 +145,13 @@ chdir ${slapos_cygroot}\\bin ...@@ -145,13 +145,13 @@ chdir ${slapos_cygroot}\\bin
start mintty.exe -i /Cygwin-Terminal.ico - start mintty.exe -i /Cygwin-Terminal.ico -
EOF EOF
chmod +x ${_filename} chmod +x ${_filename}
echo "${_filename} has been generated." csih_inform "${_filename} has been generated."
else else
echo OK. csih_inform "OK."
fi fi
_filename="/autorebase.bat" _filename="/autorebase.bat"
echo Checking ${_filename} ... csih_inform "Checking ${_filename} ..."
if [[ ! -f ${_filename} ]] ; then if [[ ! -f ${_filename} ]] ; then
cat <<EOF > ${_filename} cat <<EOF > ${_filename}
@echo off @echo off
...@@ -172,9 +172,9 @@ PAUSE ... ...@@ -172,9 +172,9 @@ PAUSE ...
EXIT 0 EXIT 0
EOF EOF
chmod +x ${_filename} chmod +x ${_filename}
echo "${_filename} has been generated." csih_inform "${_filename} has been generated."
else else
echo OK. csih_inform "OK."
fi fi
csih_inform "Patch cygwin packages for building slapos OK" csih_inform "Patch cygwin packages for building slapos OK"
...@@ -212,7 +212,7 @@ function install_slapos_cygwin_package() ...@@ -212,7 +212,7 @@ function install_slapos_cygwin_package()
csih_inform "download ${_filename} OK" csih_inform "download ${_filename} OK"
chmod +x /usr/bin/${_cmdname}.exe || csih_error "chmod /usr/bin/${_cmdname}.exe failed" chmod +x /usr/bin/${_cmdname}.exe || csih_error "chmod /usr/bin/${_cmdname}.exe failed"
done done
_path=/etc/slapos/scripts _path=/etc/slapos/scripts
csih_inform "create path: ${_path}" csih_inform "create path: ${_path}"
mkdir -p ${_path} mkdir -p ${_path}
...@@ -242,7 +242,7 @@ function remove_all_files() ...@@ -242,7 +242,7 @@ function remove_all_files()
csih_inform "Remove /usr/bin/${_cmdname}" csih_inform "Remove /usr/bin/${_cmdname}"
rm -rf /usr/bin/${_cmdname} rm -rf /usr/bin/${_cmdname}
done done
csih_inform "Remove /etc/slapos/scripts" csih_inform "Remove /etc/slapos/scripts"
rm -rf /etc/slapos/scripts rm -rf /etc/slapos/scripts
} }
...@@ -313,7 +313,7 @@ slapos_sanity_check ...@@ -313,7 +313,7 @@ slapos_sanity_check
# ====================================================================== # ======================================================================
# Force mode: remove all the files before run script # Force mode: remove all the files before run script
# ====================================================================== # ======================================================================
[[ "${_install_mode}" == "force" ]] && [[ "${_install_mode}" == "force" ]] &&
csih_inform "Force mode, cleanup all the patched files ..." && csih_inform "Force mode, cleanup all the patched files ..." &&
remove_all_files && remove_all_files &&
csih_inform "Cleanup OK." csih_inform "Cleanup OK."
......
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