Bob Mottram пре 8 година
родитељ
комит
d44b579839
2 измењених фајлова са 7 додато и 11 уклоњено
  1. 3
    5
      src/freedombone-app-gnusocial
  2. 4
    6
      src/freedombone-app-postactiv

+ 3
- 5
src/freedombone-app-gnusocial Прегледај датотеку

309
         trap "rm -f $data" 0 1 2 5 15
309
         trap "rm -f $data" 0 1 2 5 15
310
         dialog --backtitle $"Freedombone Control Panel" \
310
         dialog --backtitle $"Freedombone Control Panel" \
311
                --title $"GNU Social" \
311
                --title $"GNU Social" \
312
-               --radiolist $"Choose an operation:" 17 70 8 \
312
+               --radiolist $"Choose an operation:" 16 70 7 \
313
                1 $"Set a background image" off \
313
                1 $"Set a background image" off \
314
                2 $"Set the title" off \
314
                2 $"Set the title" off \
315
                3 $"Set post expiry period (currently $GNUSOCIAL_EXPIRE_MONTHS months)" off \
315
                3 $"Set post expiry period (currently $GNUSOCIAL_EXPIRE_MONTHS months)" off \
316
                4 $"Select Qvitter user interface" off \
316
                4 $"Select Qvitter user interface" off \
317
                5 $"Select Pleroma user interface" off \
317
                5 $"Select Pleroma user interface" off \
318
                6 $"Select Classic user interface" off \
318
                6 $"Select Classic user interface" off \
319
-               7 $"Select Armadillo user interface" off \
320
-               8 $"Exit" on 2> $data
319
+               7 $"Exit" on 2> $data
321
         sel=$?
320
         sel=$?
322
         case $sel in
321
         case $sel in
323
             1) return;;
322
             1) return;;
330
             4) gnusocial_use_qvitter gnusocial;;
329
             4) gnusocial_use_qvitter gnusocial;;
331
             5) gnusocial_use_pleroma gnusocial;;
330
             5) gnusocial_use_pleroma gnusocial;;
332
             6) gnusocial_use_classic gnusocial;;
331
             6) gnusocial_use_classic gnusocial;;
333
-            7) gnusocial_use_armadillo gnusocial;;
334
-            8) break;;
332
+            7) break;;
335
         esac
333
         esac
336
     done
334
     done
337
 }
335
 }

+ 4
- 6
src/freedombone-app-postactiv Прегледај датотеку

313
         trap "rm -f $data" 0 1 2 5 15
313
         trap "rm -f $data" 0 1 2 5 15
314
         dialog --backtitle $"Freedombone Control Panel" \
314
         dialog --backtitle $"Freedombone Control Panel" \
315
                --title $"PostActiv" \
315
                --title $"PostActiv" \
316
-               --radiolist $"Choose an operation:" 17 70 8 \
316
+               --radiolist $"Choose an operation:" 16 70 7 \
317
                1 $"Set a background image" off \
317
                1 $"Set a background image" off \
318
                2 $"Set the title" off \
318
                2 $"Set the title" off \
319
                3 $"Set post expiry period (currently $POSTACTIV_EXPIRE_MONTHS months)" off \
319
                3 $"Set post expiry period (currently $POSTACTIV_EXPIRE_MONTHS months)" off \
320
                4 $"Select Qvitter user interface" off \
320
                4 $"Select Qvitter user interface" off \
321
                5 $"Select Pleroma user interface" off \
321
                5 $"Select Pleroma user interface" off \
322
                6 $"Select Classic user interface" off \
322
                6 $"Select Classic user interface" off \
323
-               7 $"Select Armadillo user interface" off \
324
-               8 $"Exit" on 2> $data
323
+               7 $"Exit" on 2> $data
325
         sel=$?
324
         sel=$?
326
         case $sel in
325
         case $sel in
327
             1) return;;
326
             1) return;;
334
             4) gnusocial_use_qvitter postactiv;;
333
             4) gnusocial_use_qvitter postactiv;;
335
             5) gnusocial_use_pleroma postactiv;;
334
             5) gnusocial_use_pleroma postactiv;;
336
             6) gnusocial_use_classic postactiv;;
335
             6) gnusocial_use_classic postactiv;;
337
-            7) gnusocial_use_armadillo postactiv;;
338
-            8) break;;
336
+            7) break;;
339
         esac
337
         esac
340
     done
338
     done
341
 }
339
 }
813
     #function_check install_nodejs
811
     #function_check install_nodejs
814
     #install_nodejs pleroma-postactiv
812
     #install_nodejs pleroma-postactiv
815
 
813
 
816
-    install_armadillo_front_end "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL"
814
+    #install_armadillo_front_end "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL"
817
 
815
 
818
     # Currently Pleroma won't install on ARM systems
816
     # Currently Pleroma won't install on ARM systems
819
     # because it uses node-sass which doesn't support ARM
817
     # because it uses node-sass which doesn't support ARM