Browse Source

No armadillo

Bob Mottram 7 years ago
parent
commit
d44b579839
2 changed files with 7 additions and 11 deletions
  1. 3
    5
      src/freedombone-app-gnusocial
  2. 4
    6
      src/freedombone-app-postactiv

+ 3
- 5
src/freedombone-app-gnusocial View File

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

+ 4
- 6
src/freedombone-app-postactiv View File

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