From 28acc2de9983ca3cb6186d543461d0aa368578a7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 2 Apr 2018 16:04:57 +0100
Subject: [PATCH] Dialog dimensions

---
 src/freedombone-app-peertube | 6 +++---
 src/freedombone-utils-nodejs | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/freedombone-app-peertube b/src/freedombone-app-peertube
index 0c73fc78..4efbc9c2 100755
--- a/src/freedombone-app-peertube
+++ b/src/freedombone-app-peertube
@@ -318,9 +318,9 @@ function peertube_import_videos {
     dialog --backtitle $"Freedombone Control Panel" \
            --title $"Import Videos from legacy sites" \
            --form $"Enter a channel of video URL for YouTube/Vimeo/Dailymotion" 10 75 4 \
-           $"Username:" 1 1 "$MY_USERNAME" 1 28 16 15 \
-           $"Password:" 2 1 "" 2 28 40 10000 \
-           $"Video/Channel URL:" 3 1 "" 3 28 40 10000 \
+           $"Username:" 1 1 "$MY_USERNAME" 1 22 16 15 \
+           $"Password:" 2 1 "" 2 22 50 10000 \
+           $"Video/Channel URL:" 3 1 "" 3 22 50 10000 \
            2> "$data2"
     sel=$?
     case $sel in
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 3db83107..e24e2f21 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -231,10 +231,9 @@ function nodejs_setup_global_modules {
     if ! grep -q "NPM_CONFIG_PREFIX=" "$rootdir/root/.bashrc"; then
         echo "export NPM_CONFIG_PREFIX=/root/.npm-global" >> "$rootdir/root/.bashrc"
     fi
-    if [ ! "$rootdir" ]; then
-        export PATH=/root/.npm-global/bin:$PATH
-        export NPM_CONFIG_PREFIX=/root/.npm-global
-    fi
+    # shellcheck disable=SC2086
+    $mesh_install_nodejs_prefix export PATH=/root/.npm-global/bin:$PATH
+    $mesh_install_nodejs_prefix export NPM_CONFIG_PREFIX=/root/.npm-global
 }
 
 function remove_nodejs {