Skip to content

Commit a60b9ab

Browse files
committed
ensure bash
1 parent 9397152 commit a60b9ab

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

nodeapp.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function priv_update_sys_queue( $args ) {
5454
if ( is_dir( "/home/$user/.pm2" ) ) {
5555

5656
// 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 . ' && ';
5858
$cmd .= 'source /opt/nvm/nvm.sh && pm2 resurrect"' . "\n";
5959
}
6060
}
@@ -95,7 +95,7 @@ public function priv_change_web_domain_proxy_tpl( $args ) {
9595
$nodeapp_folder = $args['nodeapp_folder'];
9696

9797
// 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"';
9999
$args['cmd'] = $cmd;
100100
$args = $hcpp->do_action( 'nodeapp_install_dependencies', $args );
101101
shell_exec( $args['cmd'] );
@@ -300,7 +300,7 @@ public function startup_apps( $nodeapp_folder, $inc_root = true ) {
300300
$user = $parse[2];
301301
$domain = $parse[4];
302302
$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 ';
304304
foreach($files as $file) {
305305

306306
// Skip the root app if inc_root is false
@@ -340,10 +340,10 @@ public function shutdown_apps( $nodeapp_folder ) {
340340
$domain = $parse[4];
341341

342342
// 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 . '"';
344344
$lines = shell_exec( $cmd );
345345
$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 ';
347347
foreach( $lines as $l ) {
348348
if ( strpos( $l, '-' . $domain ) === false ) continue;
349349
$app = $hcpp->getRightMost( $hcpp->getLeftMost( $l, '-' ), ' ' );

0 commit comments

Comments
 (0)