瀏覽代碼

Dialog dimensions

Bob Mottram 7 年之前
父節點
當前提交
28acc2de99
共有 2 個檔案被更改,包括 6 行新增7 行删除
  1. 3
    3
      src/freedombone-app-peertube
  2. 3
    4
      src/freedombone-utils-nodejs

+ 3
- 3
src/freedombone-app-peertube 查看文件

318
     dialog --backtitle $"Freedombone Control Panel" \
318
     dialog --backtitle $"Freedombone Control Panel" \
319
            --title $"Import Videos from legacy sites" \
319
            --title $"Import Videos from legacy sites" \
320
            --form $"Enter a channel of video URL for YouTube/Vimeo/Dailymotion" 10 75 4 \
320
            --form $"Enter a channel of video URL for YouTube/Vimeo/Dailymotion" 10 75 4 \
321
-           $"Username:" 1 1 "$MY_USERNAME" 1 28 16 15 \
322
-           $"Password:" 2 1 "" 2 28 40 10000 \
323
-           $"Video/Channel URL:" 3 1 "" 3 28 40 10000 \
321
+           $"Username:" 1 1 "$MY_USERNAME" 1 22 16 15 \
322
+           $"Password:" 2 1 "" 2 22 50 10000 \
323
+           $"Video/Channel URL:" 3 1 "" 3 22 50 10000 \
324
            2> "$data2"
324
            2> "$data2"
325
     sel=$?
325
     sel=$?
326
     case $sel in
326
     case $sel in

+ 3
- 4
src/freedombone-utils-nodejs 查看文件

231
     if ! grep -q "NPM_CONFIG_PREFIX=" "$rootdir/root/.bashrc"; then
231
     if ! grep -q "NPM_CONFIG_PREFIX=" "$rootdir/root/.bashrc"; then
232
         echo "export NPM_CONFIG_PREFIX=/root/.npm-global" >> "$rootdir/root/.bashrc"
232
         echo "export NPM_CONFIG_PREFIX=/root/.npm-global" >> "$rootdir/root/.bashrc"
233
     fi
233
     fi
234
-    if [ ! "$rootdir" ]; then
235
-        export PATH=/root/.npm-global/bin:$PATH
236
-        export NPM_CONFIG_PREFIX=/root/.npm-global
237
-    fi
234
+    # shellcheck disable=SC2086
235
+    $mesh_install_nodejs_prefix export PATH=/root/.npm-global/bin:$PATH
236
+    $mesh_install_nodejs_prefix export NPM_CONFIG_PREFIX=/root/.npm-global
238
 }
237
 }
239
 
238
 
240
 function remove_nodejs {
239
 function remove_nodejs {