diff --git a/create_image b/create_image index 700a893..473b01f 100755 --- a/create_image +++ b/create_image @@ -12,9 +12,9 @@ fi echo "" date -echo -e "\033[36m=======================================================" -echo -e "Creating Ubuntu/Debian SD Card instalation for OrangePI" -echo -e "=======================================================\033[37m" +echo -e "\033[36m========================================================" +echo -e "Creating Ubuntu/Debian SD Card installation for OrangePI" +echo -e "========================================================\033[37m" echo "" _DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) @@ -222,17 +222,17 @@ fi #if ! chroot $odir /bin/bash /second-stage; then if ! chroot $odir /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/bash /second-stage; then mv $odir/install.log . > /dev/null 2>&1 - echo "================================================" - echo "ERROR on second-stage, instalation NOT FINISHED." - echo "================================================" + echo "=================================================" + echo "ERROR on second-stage, installation NOT FINISHED." + echo "=================================================" exit 1 fi if [ ! -f $odir/_OK_ ]; then mv $odir/install.log . > /dev/null 2>&1 - echo "================================================" - echo "ERROR on second-stage, instalation NOT FINISHED." - echo "================================================" + echo "=================================================" + echo "ERROR on second-stage, installation NOT FINISHED." + echo "=================================================" exit 1 fi @@ -379,7 +379,7 @@ echo "" date echo "" echo "************************************************************" -echo "Instalation finished." +echo "Installation finished." echo "" if [ ! "${sdcard}" = "" ]; then echo "You have bootable OrangePI SD Card image \"${sdcard}\"." @@ -387,7 +387,7 @@ if [ ! "${sdcard}" = "" ]; then echo " e.g. sudo dd if=$sdcard of=/dev/ bs=1M" else if [ "${_directsd}" = "yes" ] ; then - echo "You have OrangePI $distro instalation on $image_name." + echo "You have OrangePI $distro installation on $image_name." else if [ ! "${_boot_on_ext4}" = "yes" ] ; then echo "Copy files from $bootdir to SD Card boot partition" diff --git a/format.sh b/format.sh index d6e080b..711b92f 100644 --- a/format.sh +++ b/format.sh @@ -5,9 +5,9 @@ if [ "${_format}" = "btrfs" ]; then _boot_on_ext4="no" fi -# ====================================================================== -# IF CREATING ON IMMAGE, PREPARE SD CARD IMAGE FOR ORANGEPI - LINUX BOOT -# ---------------------------------------------------------------------- +# ===================================================================== +# IF CREATING ON IMAGE, PREPARE SD CARD IMAGE FOR ORANGEPI - LINUX BOOT +# --------------------------------------------------------------------- # === CHECK DESTINATION ============================================ if [ ! "${image_name}" = "" ]; then rm ${sdcard}1 > /dev/null 2>&1 @@ -158,45 +158,45 @@ if [ ! "${sdcard}" = "" ]; then echo "" if [ ! "${_boot_on_ext4}" = "yes" ] ; then - echo "Formating fat partition ..." + echo "Formatting fat partition ..." mkfs -t vfat -F 32 -n BOOT ${sdcard}1 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating fat partition." + echo "ERROR formatting fat partition." exit 0 fi vfatuuid=`blkid -s UUID -o value ${sdcard}1` echo " fat partition formated." if [ "${_format}" = "btrfs" ] ; then - echo "Formating linux partition (btrfs), please wait ..." + echo "Formatting linux partition (btrfs), please wait ..." # format as btrfs mkfs.btrfs -O ^extref,^skinny-metadata -f -L linux ${sdcard}2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating btrfs partition." + echo "ERROR formatting btrfs partition." exit 1 fi else - echo "Formating linux partition (ext4), please wait ..." + echo "Formatting linux partition (ext4), please wait ..." mkfs -F -t ext4 -L linux ${sdcard}2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating ext4 partition." + echo "ERROR formatting ext4 partition." exit 1 fi fi ext4uuid=`blkid -s UUID -o value ${sdcard}2` else if [ "${_format}" = "btrfs" ] ; then - echo "Formating linux partition (btrfs), please wait ..." + echo "Formatting linux partition (btrfs), please wait ..." # format as btrfs mkfs.btrfs -O ^extref,^skinny-metadata -f -L linux ${sdcard}2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating btrfs partition." + echo "ERROR formatting btrfs partition." exit 1 fi else - echo "Formating linux partition (ext4), please wait ..." + echo "Formatting linux partition (ext4), please wait ..." mkfs -F -t ext4 -L linux ${sdcard}1 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating ext4 partition." + echo "ERROR formatting ext4 partition." exit 0 fi fi diff --git a/fs_resize b/fs_resize index e2fe3bc..466b782 100755 --- a/fs_resize +++ b/fs_resize @@ -50,7 +50,7 @@ else fi echo "" if [ $part_end -ge $sdcard_end ]; then - echo "Partition allready maximum size !" + echo "Partition already has maximum size!" rm /usr/local/bin/fs_resize_warning > /dev/null 2>&1 exit 0 fi @@ -59,7 +59,7 @@ echo -n "WARNING: Do you want to resize \"$sdcard_part\" (y/N)? " read -n 1 ANSWER if [ ! "${ANSWER}" = "y" ] ; then echo "" - echo "Canceled.." + echo "Cancelled.." exit 0 fi echo "" diff --git a/install_lxde_desktop b/install_lxde_desktop index b7437a2..4806802 100755 --- a/install_lxde_desktop +++ b/install_lxde_desktop @@ -20,7 +20,7 @@ echo "" # Check if we have enough disk space. S=`df / | tail -n 1 | awk '{printf $4}' | sed s/[G,M,K]//g` if [ "$S" -le "500000" ]; then - echo "We need at least 500MB free to perform minimal desktop instalation" + echo "We need at least 500MB free to perform minimal desktop installation" echo "Have you resized your partition (fs_resize)?" exit 0 fi diff --git a/install_mate_desktop b/install_mate_desktop index 91416f2..a520a9b 100755 --- a/install_mate_desktop +++ b/install_mate_desktop @@ -20,7 +20,7 @@ echo "" # Check if we have enough disk space. S=`df / | tail -n 1 | awk '{printf $4}' | sed s/[G,M,K]//g` if [ "$S" -le "500000" ]; then - echo "We need at least 500MB free to perform minimal desktop instalation" + echo "We need at least 500MB free to perform minimal desktop installation" echo "Have you resized your partition (fs_resize)?" exit 0 fi diff --git a/install_to_emmc b/install_to_emmc index f96e335..c2cb2f6 100755 --- a/install_to_emmc +++ b/install_to_emmc @@ -43,7 +43,7 @@ read -n 1 ANSWER if [ ! "${ANSWER}" = "y" ] ; then echo "." - echo "Canceled.." + echo "Cancelled.." exit 0 fi echo "" @@ -83,13 +83,13 @@ if [ $? -ne 0 ]; then fi sleep 1 -echo "Formating fat partition ..." +echo "Formatting fat partition ..." dd if=/dev/zero of=${sdcard}p1 bs=1M count=1 oflag=direct > /dev/null 2>&1 sync sleep 1 mkfs.vfat -n EMMCBOOT ${sdcard}p1 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ERROR formating fat partition." + echo " ERROR formatting fat partition." exit 1 fi echo " fat partition formated." @@ -98,18 +98,18 @@ dd if=/dev/zero of=${sdcard}p2 bs=1M count=1 oflag=direct > /dev/null 2>&1 sync sleep 1 if [ "${_format}" = "btrfs" ] ; then - echo "Formating linux partition (btrfs), please wait ..." + echo "Formatting linux partition (btrfs), please wait ..." # format as btrfs mkfs.btrfs -O ^extref,^skinny-metadata -f -L emmclinux ${sdcard}p2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating btrfs partition." + echo "ERROR formatting btrfs partition." exit 1 fi else - echo "Formating linux partition (ext4), please wait ..." + echo "Formatting linux partition (ext4), please wait ..." mkfs.ext4 -L emmclinux ${sdcard}p2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating ext4 partition." + echo "ERROR formatting ext4 partition." exit 1 fi fi diff --git a/install_to_sdcard b/install_to_sdcard index 8621c68..c4c6a0a 100755 --- a/install_to_sdcard +++ b/install_to_sdcard @@ -47,7 +47,7 @@ read -n 1 ANSWER if [ ! "${ANSWER}" = "y" ] ; then echo "." - echo "Canceled.." + echo "Cancelled.." exit 0 fi echo "" @@ -87,13 +87,13 @@ if [ $? -ne 0 ]; then fi sleep 1 -echo "Formating fat partition ..." +echo "Formatting fat partition ..." dd if=/dev/zero of=${sdcard}p1 bs=1M count=1 oflag=direct > /dev/null 2>&1 sync sleep 1 mkfs.vfat -n BOOT ${sdcard}p1 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ERROR formating fat partition." + echo " ERROR formatting fat partition." exit 1 fi echo " fat partition formated." @@ -102,18 +102,18 @@ dd if=/dev/zero of=${sdcard}p2 bs=1M count=1 oflag=direct > /dev/null 2>&1 sync sleep 1 if [ "${_format}" = "btrfs" ] ; then - echo "Formating linux partition (btrfs), please wait ..." + echo "Formatting linux partition (btrfs), please wait ..." # format as btrfs mkfs.btrfs -O ^extref,^skinny-metadata -f -L linux ${sdcard}p2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating btrfs partition." + echo "ERROR formatting btrfs partition." exit 1 fi else - echo "Formating linux partition (ext4), please wait ..." + echo "Formatting linux partition (ext4), please wait ..." mkfs.ext4 -L linux ${sdcard}p2 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "ERROR formating ext4 partition." + echo "ERROR formatting ext4 partition." exit 1 fi fi diff --git a/install_xfce_desktop b/install_xfce_desktop index 765497b..ddcfbb9 100755 --- a/install_xfce_desktop +++ b/install_xfce_desktop @@ -20,7 +20,7 @@ echo "" # Check if we have enough disk space. S=`df / | tail -n 1 | awk '{printf $4}' | sed s/[G,M,K]//g` if [ "$S" -le "500000" ]; then - echo "We need at least 500MB free to perform minimal desktop instalation" + echo "We need at least 500MB free to perform minimal desktop installation" echo "Have you resized your partition (fs_resize)?" exit 0 fi diff --git a/params.sh b/params.sh index a525051..999f119 100644 --- a/params.sh +++ b/params.sh @@ -5,7 +5,7 @@ # ***************************************************** -# Set to "yes" to create realy minimal image * +# Set to "yes" to create really minimal image * # ***************************************************** ONLY_BASE="no" @@ -37,11 +37,11 @@ LANG="en_US.UTF-8" # ***************************************************** # Set the base name of your image. * -# Distro name is automaticaty appended, and the image * -# will be "image_name-distro.img" * +# Distro name is automatically appended, and the * +# image will be "image_name-distro.img". * # --------------------------------------------------- * # IF image_name="", image file won't be created, * -# instalation will be created in local directories * +# installation will be created in local directories * # linux-$distro & boot-$distro * # YOU CAN CREATE THE IMAGE LATER RUNNING: * # sudo ./image_from_dir * @@ -49,9 +49,10 @@ LANG="en_US.UTF-8" # --------------------------------------------------- * # IF image_name is BLOCK DEVICE (/dev/sdXn) * # LINUX filesystem will be created directly on it * -# Partition must exist ! * +# partition must exist! * # IF _format="" partition will NOT be formated * -# otherwyse it will be formated with specified format * +# otherwise it will be formatted with specified * +# format. * # ***************************************************** image_name="" #image_name="minimal" @@ -120,7 +121,7 @@ _compress="yes" # IF YOU WANT TO HAVE BOOT FILES ON EXT4 PARTITION = # AND NOT ON SEPARATE FAT16 PARTITION = # set _boot_on_ext4="yes" and = -# FAT partitin won't be created = +# FAT partition won't be created = # --------------------------------------------------- = # DO NOT CHANGE FOR NOW ! = # ===================================================== diff --git a/second-stage b/second-stage index aad1361..be789b6 100755 --- a/second-stage +++ b/second-stage @@ -418,7 +418,7 @@ chown -R $USER:$USER /home/$USER rm /usr/sbin/policy-rc.d echo "" -echo "Instalation finished." +echo "Installation finished." echo "" touch /_OK_ diff --git a/update_boot.sh b/update_boot.sh index 211e88d..6e55975 100755 --- a/update_boot.sh +++ b/update_boot.sh @@ -80,7 +80,7 @@ fi echo "" echo "===============================" -echo "Select hdmi display resolutuin:" +echo "Select hdmi display resolution:" echo " 1 1080p 60Hz" echo " 2 1080p 50Hz" echo " 3 720p 60Hz"