Browse Source

Line endings on mesh startup script

Bob Mottram 8 years ago
parent
commit
288e6c5aca
1 changed files with 30 additions and 30 deletions
  1. 30
    30
      src/freedombone-image-customise

+ 30
- 30
src/freedombone-image-customise View File

@@ -584,7 +584,7 @@ function mesh_client_startup_applications {
584 584
     fi
585 585
 
586 586
     START_DESKTOP=$rootdir/home/$MY_USERNAME/mesh-desktop.sh
587
-	FIRST_BOOT=/home/$MY_USERNAME/.first_boot
587
+    FIRST_BOOT=/home/$MY_USERNAME/.first_boot
588 588
     echo '#!/bin/bash' > $START_DESKTOP
589 589
     echo "setxkbmap ${KEYBOARD_MAP}" > $START_DESKTOP
590 590
     echo 'dconf write /org/mate/caja/desktop/volumes-visible false' >> $START_DESKTOP
@@ -600,35 +600,35 @@ function mesh_client_startup_applications {
600 600
     echo "env | grep DBUS_SESSION_BUS_ADDRESS > /home/$MY_USERNAME/.dbus/Xdbus" >> $START_DESKTOP
601 601
     echo "echo 'export DBUS_SESSION_BUS_ADDRESS' >> /home/$MY_USERNAME/.dbus/Xdbus" >> $START_DESKTOP
602 602
 
603
-	echo '' >> $START_DESKTOP
604
-	echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP
605
-	echo '	exit 0' >> $START_DESKTOP
606
-	echo 'fi' >> $START_DESKTOP
607
-	echo '' >> $START_DESKTOP
608
-	echo 'INITIAL_TOX_USERNAME=' >> $START_DESKTOP
609
-	echo 'while [ ! $INITIAL_TOX_USERNAME ]; do' >> $START_DESKTOP
610
-	echo '	data=$(tempfile 2>/dev/null)' >> $START_DESKTOP
611
-	echo '	trap "rm -f $data" 0 1 2 5 15' >> $START_DESKTOP
612
-	echo "	dialog --title \"${MESH_TITLE}\" " >> $START_DESKTOP
613
-	echo "		   --backtitle \"${MESH_TITLE}\" " >> $START_DESKTOP
614
-	echo -n "		   --inputbox \"${MESH_SET_USERNAME}\" 12 60 Anon " >> $START_DESKTOP
615
-	echo '2>$data' >> $START_DESKTOP
616
-	echo '	sel=$?' >> $START_DESKTOP
617
-	echo '	case $sel in' >> $START_DESKTOP
618
-	echo '		0)' >> $START_DESKTOP
619
-	echo '			INITIAL_TOX_USERNAME=$(<$data)' >> $START_DESKTOP
620
-	echo '			if [ ${#INITIAL_TOX_USERNAME} -lt 1 ]; then' >> $START_DESKTOP
621
-	echo '				INITIAL_TOX_USERNAME=' >> $START_DESKTOP
622
-	echo '			fi' >> $START_DESKTOP
623
-	echo '			;;' >> $START_DESKTOP
624
-	echo '	esac' >> $START_DESKTOP
625
-	echo 'done' >> $START_DESKTOP
626
-	echo '' >> $START_DESKTOP
627
-	echo 'toxid --setuser "$INITIAL_TOX_USERNAME"' >> $START_DESKTOP
628
-	echo '' >> $START_DESKTOP
629
-	echo "rm -f $FIRST_BOOT" >> $START_DESKTOP
630
-	echo '' >> $START_DESKTOP
631
-	echo 'exit 0' >> $START_DESKTOP
603
+    echo '' >> $START_DESKTOP
604
+    echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP
605
+    echo '  exit 0' >> $START_DESKTOP
606
+    echo 'fi' >> $START_DESKTOP
607
+    echo '' >> $START_DESKTOP
608
+    echo 'INITIAL_TOX_USERNAME=' >> $START_DESKTOP
609
+    echo 'while [ ! $INITIAL_TOX_USERNAME ]; do' >> $START_DESKTOP
610
+    echo '  data=$(tempfile 2>/dev/null)' >> $START_DESKTOP
611
+    echo '  trap "rm -f $data" 0 1 2 5 15' >> $START_DESKTOP
612
+    echo -n "   dialog --title \"${MESH_TITLE}\" " >> $START_DESKTOP
613
+    echo -n "--backtitle \"${MESH_TITLE}\" " >> $START_DESKTOP
614
+    echo -n "--inputbox \"${MESH_SET_USERNAME}\" 12 60 Anon " >> $START_DESKTOP
615
+    echo '2>$data' >> $START_DESKTOP
616
+    echo '  sel=$?' >> $START_DESKTOP
617
+    echo '  case $sel in' >> $START_DESKTOP
618
+    echo '      0)' >> $START_DESKTOP
619
+    echo '          INITIAL_TOX_USERNAME=$(<$data)' >> $START_DESKTOP
620
+    echo '          if [ ${#INITIAL_TOX_USERNAME} -lt 1 ]; then' >> $START_DESKTOP
621
+    echo '              INITIAL_TOX_USERNAME=' >> $START_DESKTOP
622
+    echo '          fi' >> $START_DESKTOP
623
+    echo '          ;;' >> $START_DESKTOP
624
+    echo '  esac' >> $START_DESKTOP
625
+    echo 'done' >> $START_DESKTOP
626
+    echo '' >> $START_DESKTOP
627
+    echo 'toxid --setuser "$INITIAL_TOX_USERNAME"' >> $START_DESKTOP
628
+    echo '' >> $START_DESKTOP
629
+    echo "rm -f $FIRST_BOOT" >> $START_DESKTOP
630
+    echo '' >> $START_DESKTOP
631
+    echo 'exit 0' >> $START_DESKTOP
632 632
     chmod +x $START_DESKTOP
633 633
 
634 634
     START_DESKTOP2=$rootdir/home/$MY_USERNAME/.config/autostart/mesh-start.desktop