Skip to content

Commit

Permalink
fix some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
felgru committed Dec 10, 2015
1 parent b08fd20 commit f3fea75
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 52 deletions.
22 changes: 11 additions & 11 deletions create_image
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -379,15 +379,15 @@ echo ""
date
echo ""
echo "************************************************************"
echo "Instalation finished."
echo "Installation finished."
echo ""
if [ ! "${sdcard}" = "" ]; then
echo "You have bootable OrangePI SD Card image \"${sdcard}\"."
echo "Use dd to copy to your SDCard"
echo " e.g. sudo dd if=$sdcard of=/dev/<your_sdcard> 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"
Expand Down
26 changes: 13 additions & 13 deletions format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions fs_resize
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion install_lxde_desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install_mate_desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions install_to_emmc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ read -n 1 ANSWER

if [ ! "${ANSWER}" = "y" ] ; then
echo "."
echo "Canceled.."
echo "Cancelled.."
exit 0
fi
echo ""
Expand Down Expand Up @@ -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."
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions install_to_sdcard
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ read -n 1 ANSWER

if [ ! "${ANSWER}" = "y" ] ; then
echo "."
echo "Canceled.."
echo "Cancelled.."
exit 0
fi
echo ""
Expand Down Expand Up @@ -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."
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install_xfce_desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions params.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


# *****************************************************
# Set to "yes" to create realy minimal image *
# Set to "yes" to create really minimal image *
# *****************************************************
ONLY_BASE="no"

Expand Down Expand Up @@ -37,21 +37,22 @@ 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 <directory> <DEVICE|IMAGE> *
# === IT IS THE RECOMMENDED WAY OF IMAGE CREATION === *
# --------------------------------------------------- *
# 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"
Expand Down Expand Up @@ -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 ! =
# =====================================================
Expand Down
2 changes: 1 addition & 1 deletion second-stage
Original file line number Diff line number Diff line change
Expand Up @@ -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_

Expand Down
2 changes: 1 addition & 1 deletion update_boot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f3fea75

Please sign in to comment.