Skip to content
Snippets Groups Projects
Commit 9fb0c666 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'task-5047-fix-eol' into 'master'

task#5047 - FIX EOL in ci-custom-vars

See merge request !16
parents 6be83420 300dfc01
No related branches found
No related tags found
1 merge request!16task#5047 - FIX EOL in ci-custom-vars
Pipeline #503 passed
...@@ -1707,7 +1707,16 @@ class project extends base { ...@@ -1707,7 +1707,16 @@ class project extends base {
// -------------------------------------------------- // --------------------------------------------------
$sCfgout=$sTempBuildDir . '/ci-custom-vars'; $sCfgout=$sTempBuildDir . '/ci-custom-vars';
if (isset($this->_aPrjConfig['deploy']["configfile"]) && $this->_aPrjConfig['deploy']["configfile"]){ if (isset($this->_aPrjConfig['deploy']["configfile"]) && $this->_aPrjConfig['deploy']["configfile"]){
file_put_contents($sCfgout, $this->_aPrjConfig['deploy']["configfile"]);
# task#5047 - FIX EOL
$sCfgContent=$this->_aPrjConfig['deploy']["configfile"];
// detect unix, linux, mac
if (DIRECTORY_SEPARATOR === '/') {
$sCfgContent=str_replace("\r\n", "\n", $sCfgContent);
}
# /task#5047
file_put_contents($sCfgout, $sCfgContent);
$sReturn.=$this->_execAndSend('ls -l ' . $sCfgout); $sReturn.=$this->_execAndSend('ls -l ' . $sCfgout);
$sReturn.=$this->_execAndSend('cat ' . $sCfgout); $sReturn.=$this->_execAndSend('cat ' . $sCfgout);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment