mirror of
				https://github.com/easingthemes/ssh-deploy.git
				synced 2025-10-30 23:30:09 +08:00 
			
		
		
		
	better reject message
This commit is contained in:
		
							parent
							
								
									d2c8b9d363
								
							
						
					
					
						commit
						1e6acacd13
					
				
							
								
								
									
										2
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -3,12 +3,11 @@ const { exec } = require('child_process'); | |||||||
| const { privateKey, sshServer, githubWorkspace } = require('./inputs'); | const { privateKey, sshServer, githubWorkspace } = require('./inputs'); | ||||||
| const { writeToFile } = require('./helpers'); | const { writeToFile } = require('./helpers'); | ||||||
| 
 | 
 | ||||||
| const handleError = (errorMessage, isRequired, callback) => { | const handleError = (message, isRequired, callback) => { | ||||||
|   const message = `⚠️ [CMD] Remote script failed: ${errorMessage}`; |  | ||||||
|   if (isRequired) { |   if (isRequired) { | ||||||
|     callback(new Error(message)); |     callback(new Error(message)); | ||||||
|   } else { |   } else { | ||||||
|     console.log(message); |     console.warn(message); | ||||||
|   } |   } | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| @ -16,10 +15,12 @@ const remoteCmd = async (content, label, isRequired) => new Promise((resolve, re | |||||||
|   const filename = `local_ssh_script-${label}.sh`; |   const filename = `local_ssh_script-${label}.sh`; | ||||||
|   try { |   try { | ||||||
|     writeToFile({ dir: githubWorkspace, filename, content }); |     writeToFile({ dir: githubWorkspace, filename, content }); | ||||||
| 
 |     console.log(`Executing remote script: ssh -i ${privateKey} ${sshServer}`); | ||||||
|     exec(`DEBIAN_FRONTEND=noninteractive ssh -i ${privateKey} ${sshServer} 'RSYNC_STDOUT=${process.env.RSYNC_STDOUT} bash -s' < ${filename}`, (err, data, stderr) => { |     exec(`DEBIAN_FRONTEND=noninteractive ssh -i ${privateKey} ${sshServer} 'RSYNC_STDOUT=${process.env.RSYNC_STDOUT} bash -s' < ${filename}`, (err, data, stderr) => { | ||||||
|       if (err) { |       if (err) { | ||||||
|         handleError(err.message, isRequired, reject); |         const message = `⚠️ [CMD] Remote script failed: ${err.message}`; | ||||||
|  |         console.warn(`${message} \n`, data, stderr); | ||||||
|  |         handleError(message, isRequired, reject); | ||||||
|       } else { |       } else { | ||||||
|         console.log('✅ [CMD] Remote script executed. \n', data, stderr); |         console.log('✅ [CMD] Remote script executed. \n', data, stderr); | ||||||
|         resolve(data); |         resolve(data); | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Dragan Filipovic
						Dragan Filipovic