@@ -54,7 +54,7 @@ public function priv_update_sys_queue( $args ) {
54
54
if ( is_dir ( "/home/ $ user/.pm2 " ) ) {
55
55
56
56
// Restart any pm2 processes
57
- $ cmd .= 'runuser -l ' . $ user . ' -c "cd /home/ ' . $ user . ' && ' ;
57
+ $ cmd .= 'runuser -s /bin/bash - l ' . $ user . ' -c "cd /home/ ' . $ user . ' && ' ;
58
58
$ cmd .= 'source /opt/nvm/nvm.sh && pm2 resurrect" ' . "\n" ;
59
59
}
60
60
}
@@ -95,7 +95,7 @@ public function priv_change_web_domain_proxy_tpl( $args ) {
95
95
$ nodeapp_folder = $ args ['nodeapp_folder ' ];
96
96
97
97
// Install dependencies
98
- $ cmd = 'runuser -l ' . $ user . ' -c "cd \" ' . $ nodeapp_folder . '\" && source /opt/nvm/nvm.sh && npm install" ' ;
98
+ $ cmd = 'runuser -s /bin/bash - l ' . $ user . ' -c "cd \" ' . $ nodeapp_folder . '\" && source /opt/nvm/nvm.sh && npm install" ' ;
99
99
$ args ['cmd ' ] = $ cmd ;
100
100
$ args = $ hcpp ->do_action ( 'nodeapp_install_dependencies ' , $ args );
101
101
shell_exec ( $ args ['cmd ' ] );
@@ -300,7 +300,7 @@ public function startup_apps( $nodeapp_folder, $inc_root = true ) {
300
300
$ user = $ parse [2 ];
301
301
$ domain = $ parse [4 ];
302
302
$ files = $ this ->get_config_files ( $ nodeapp_folder );
303
- $ cmd = 'runuser -l ' . $ user . ' -c "cd \" ' . $ nodeapp_folder . '\" && source /opt/nvm/nvm.sh ' ;
303
+ $ cmd = 'runuser -s /bin/bash - l ' . $ user . ' -c "cd \" ' . $ nodeapp_folder . '\" && source /opt/nvm/nvm.sh ' ;
304
304
foreach ($ files as $ file ) {
305
305
306
306
// Skip the root app if inc_root is false
@@ -340,10 +340,10 @@ public function shutdown_apps( $nodeapp_folder ) {
340
340
$ domain = $ parse [4 ];
341
341
342
342
// Get list of apps to delete
343
- $ cmd = 'runuser -l ' . $ user . ' -c "source /opt/nvm/nvm.sh ; pm2 ls | grep ' . $ domain . '" ' ;
343
+ $ cmd = 'runuser -s /bin/bash - l ' . $ user . ' -c "source /opt/nvm/nvm.sh ; pm2 ls | grep ' . $ domain . '" ' ;
344
344
$ lines = shell_exec ( $ cmd );
345
345
$ lines = explode ( "\n" , $ lines );
346
- $ cmd = 'runuser -l ' . $ user . ' -c "cd \" ' . $ nodeapp_folder . '\" && source /opt/nvm/nvm.sh ' ;
346
+ $ cmd = 'runuser -s /bin/bash - l ' . $ user . ' -c "cd \" ' . $ nodeapp_folder . '\" && source /opt/nvm/nvm.sh ' ;
347
347
foreach ( $ lines as $ l ) {
348
348
if ( strpos ( $ l , '- ' . $ domain ) === false ) continue ;
349
349
$ app = $ hcpp ->getRightMost ( $ hcpp ->getLeftMost ( $ l , '- ' ), ' ' );
0 commit comments