Skip to content

Commit 6d8ca4b

Browse files
felgrufelgru
committed
fix some typos
1 parent b15a1b6 commit 6d8ca4b

11 files changed

Lines changed: 53 additions & 52 deletions

‎create_image‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ fi
1212

1313
echo ""
1414
date
15-
echo -e "\033[36m======================================================="
16-
echo -e "Creating Ubuntu/Debian SD Card instalation for OrangePI"
17-
echo -e "=======================================================\033[37m"
15+
echo -e "\033[36m========================================================"
16+
echo -e "Creating Ubuntu/Debian SD Card installation for OrangePI"
17+
echo -e "========================================================\033[37m"
1818
echo ""
1919

2020
_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
@@ -223,17 +223,17 @@ fi
223223
#if ! chroot $odir /bin/bash /second-stage; then
224224
if ! chroot $odir /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/bash /second-stage; then
225225
mv $odir/install.log . > /dev/null 2>&1
226-
echo "================================================"
227-
echo "ERROR on second-stage, instalation NOT FINISHED."
228-
echo "================================================"
226+
echo "================================================="
227+
echo "ERROR on second-stage, installation NOT FINISHED."
228+
echo "================================================="
229229
exit 1
230230
fi
231231

232232
if [ ! -f $odir/_OK_ ]; then
233233
mv $odir/install.log . > /dev/null 2>&1
234-
echo "================================================"
235-
echo "ERROR on second-stage, instalation NOT FINISHED."
236-
echo "================================================"
234+
echo "================================================="
235+
echo "ERROR on second-stage, installation NOT FINISHED."
236+
echo "================================================="
237237
exit 1
238238
fi
239239

@@ -343,15 +343,15 @@ echo ""
343343
date
344344
echo ""
345345
echo "************************************************************"
346-
echo "Instalation finished."
346+
echo "Installation finished."
347347
echo ""
348348
if [ ! "${sdcard}" = "" ]; then
349349
echo "You have bootable OrangePI SD Card image \"${sdcard}\"."
350350
echo "Use dd to copy to your SDCard"
351351
echo " e.g. sudo dd if=$sdcard of=/dev/<your_sdcard> bs=1M"
352352
else
353353
if [ "${_directsd}" = "yes" ] ; then
354-
echo "You have OrangePI $distro instalation on $image_name."
354+
echo "You have OrangePI $distro installation on $image_name."
355355
else
356356
if [ ! "${_boot_on_ext4}" = "yes" ] ; then
357357
echo "Copy files from $bootdir to SD Card boot partition"

‎format.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ if [ "${_format}" = "btrfs" ]; then
55
_boot_on_ext4="no"
66
fi
77

8-
# ======================================================================
9-
# IF CREATING ON IMMAGE, PREPARE SD CARD IMAGE FOR ORANGEPI - LINUX BOOT
10-
# ----------------------------------------------------------------------
8+
# =====================================================================
9+
# IF CREATING ON IMAGE, PREPARE SD CARD IMAGE FOR ORANGEPI - LINUX BOOT
10+
# ---------------------------------------------------------------------
1111
# === CHECK DESTINATION ============================================
1212
if [ ! "${image_name}" = "" ]; then
1313
rm ${sdcard}1 > /dev/null 2>&1
@@ -156,45 +156,45 @@ if [ ! "${sdcard}" = "" ]; then
156156

157157
echo ""
158158
if [ ! "${_boot_on_ext4}" = "yes" ] ; then
159-
echo "Formating fat partition ..."
159+
echo "Formatting fat partition ..."
160160
mkfs -t vfat -F 32 -n BOOT ${sdcard}1 > /dev/null 2>&1
161161
if [ $? -ne 0 ]; then
162-
echo "ERROR formating fat partition."
162+
echo "ERROR formatting fat partition."
163163
exit 0
164164
fi
165165
vfatuuid=`blkid -s UUID -o value ${sdcard}1`
166166
echo " fat partition formated."
167167
if [ "${_format}" = "btrfs" ] ; then
168-
echo "Formating linux partition (btrfs), please wait ..."
168+
echo "Formatting linux partition (btrfs), please wait ..."
169169
# format as btrfs
170170
mkfs.btrfs -O ^extref -f -L linux ${sdcard}2 > /dev/null 2>&1
171171
if [ $? -ne 0 ]; then
172-
echo "ERROR formating btrfs partition."
172+
echo "ERROR formatting btrfs partition."
173173
exit 1
174174
fi
175175
else
176-
echo "Formating linux partition (ext4), please wait ..."
176+
echo "Formatting linux partition (ext4), please wait ..."
177177
mkfs -F -t ext4 -L linux ${sdcard}2 > /dev/null 2>&1
178178
if [ $? -ne 0 ]; then
179-
echo "ERROR formating ext4 partition."
179+
echo "ERROR formatting ext4 partition."
180180
exit 1
181181
fi
182182
fi
183183
ext4uuid=`blkid -s UUID -o value ${sdcard}2`
184184
else
185185
if [ "${_format}" = "btrfs" ] ; then
186-
echo "Formating linux partition (btrfs), please wait ..."
186+
echo "Formatting linux partition (btrfs), please wait ..."
187187
# format as btrfs
188188
mkfs.btrfs -O ^extref -f -L linux ${sdcard}2 > /dev/null 2>&1
189189
if [ $? -ne 0 ]; then
190-
echo "ERROR formating btrfs partition."
190+
echo "ERROR formatting btrfs partition."
191191
exit 1
192192
fi
193193
else
194-
echo "Formating linux partition (ext4), please wait ..."
194+
echo "Formatting linux partition (ext4), please wait ..."
195195
mkfs -F -t ext4 -L linux ${sdcard}1 > /dev/null 2>&1
196196
if [ $? -ne 0 ]; then
197-
echo "ERROR formating ext4 partition."
197+
echo "ERROR formatting ext4 partition."
198198
exit 0
199199
fi
200200
fi

‎fs_resize‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ else
5050
fi
5151
echo ""
5252
if [ $part_end -ge $sdcard_end ]; then
53-
echo "Partition allready maximum size !"
53+
echo "Partition already has maximum size!"
5454
rm /usr/local/bin/fs_resize_warning > /dev/null 2>&1
5555
exit 0
5656
fi
@@ -59,7 +59,7 @@ echo -n "WARNING: Do you want to resize \"$sdcard_part\" (y/N)? "
5959
read -n 1 ANSWER
6060
if [ ! "${ANSWER}" = "y" ] ; then
6161
echo ""
62-
echo "Canceled.."
62+
echo "Cancelled.."
6363
exit 0
6464
fi
6565
echo ""

‎install_lxde_desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ echo ""
2020
# Check if we have enough disk space.
2121
S=`df / | tail -n 1 | awk '{printf $4}' | sed s/[G,M,K]//g`
2222
if [ "$S" -le "500000" ]; then
23-
echo "We need at least 500MB free to perform minimal desktop instalation"
23+
echo "We need at least 500MB free to perform minimal desktop installation"
2424
echo "Have you resized your partition (fs_resize)?"
2525
exit 0
2626
fi

‎install_mate_desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ echo ""
2020
# Check if we have enough disk space.
2121
S=`df / | tail -n 1 | awk '{printf $4}' | sed s/[G,M,K]//g`
2222
if [ "$S" -le "500000" ]; then
23-
echo "We need at least 500MB free to perform minimal desktop instalation"
23+
echo "We need at least 500MB free to perform minimal desktop installation"
2424
echo "Have you resized your partition (fs_resize)?"
2525
exit 0
2626
fi

‎install_to_emmc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ read -n 1 ANSWER
4343

4444
if [ ! "${ANSWER}" = "y" ] ; then
4545
echo "."
46-
echo "Canceled.."
46+
echo "Cancelled.."
4747
exit 0
4848
fi
4949
echo ""
@@ -83,13 +83,13 @@ if [ $? -ne 0 ]; then
8383
fi
8484
sleep 1
8585

86-
echo "Formating fat partition ..."
86+
echo "Formatting fat partition ..."
8787
dd if=/dev/zero of=${sdcard}p1 bs=1M count=1 oflag=direct > /dev/null 2>&1
8888
sync
8989
sleep 1
9090
mkfs.vfat -n EMMCBOOT ${sdcard}p1 > /dev/null 2>&1
9191
if [ $? -ne 0 ]; then
92-
echo " ERROR formating fat partition."
92+
echo " ERROR formatting fat partition."
9393
exit 1
9494
fi
9595
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
9898
sync
9999
sleep 1
100100
if [ "${_format}" = "btrfs" ] ; then
101-
echo "Formating linux partition (btrfs), please wait ..."
101+
echo "Formatting linux partition (btrfs), please wait ..."
102102
# format as btrfs
103103
mkfs.btrfs -O ^extref -f -L emmclinux ${sdcard}p2 > /dev/null 2>&1
104104
if [ $? -ne 0 ]; then
105-
echo "ERROR formating btrfs partition."
105+
echo "ERROR formatting btrfs partition."
106106
exit 1
107107
fi
108108
else
109-
echo "Formating linux partition (ext4), please wait ..."
109+
echo "Formatting linux partition (ext4), please wait ..."
110110
mkfs.ext4 -L emmclinux ${sdcard}p2 > /dev/null 2>&1
111111
if [ $? -ne 0 ]; then
112-
echo "ERROR formating ext4 partition."
112+
echo "ERROR formatting ext4 partition."
113113
exit 1
114114
fi
115115
fi

‎install_to_sdcard‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ read -n 1 ANSWER
4747

4848
if [ ! "${ANSWER}" = "y" ] ; then
4949
echo "."
50-
echo "Canceled.."
50+
echo "Cancelled.."
5151
exit 0
5252
fi
5353
echo ""
@@ -87,13 +87,13 @@ if [ $? -ne 0 ]; then
8787
fi
8888
sleep 1
8989

90-
echo "Formating fat partition ..."
90+
echo "Formatting fat partition ..."
9191
dd if=/dev/zero of=${sdcard}p1 bs=1M count=1 oflag=direct > /dev/null 2>&1
9292
sync
9393
sleep 1
9494
mkfs.vfat -n BOOT ${sdcard}p1 > /dev/null 2>&1
9595
if [ $? -ne 0 ]; then
96-
echo " ERROR formating fat partition."
96+
echo " ERROR formatting fat partition."
9797
exit 1
9898
fi
9999
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
102102
sync
103103
sleep 1
104104
if [ "${_format}" = "btrfs" ] ; then
105-
echo "Formating linux partition (btrfs), please wait ..."
105+
echo "Formatting linux partition (btrfs), please wait ..."
106106
# format as btrfs
107107
mkfs.btrfs -O ^extref -f -L linux ${sdcard}p2 > /dev/null 2>&1
108108
if [ $? -ne 0 ]; then
109-
echo "ERROR formating btrfs partition."
109+
echo "ERROR formatting btrfs partition."
110110
exit 1
111111
fi
112112
else
113-
echo "Formating linux partition (ext4), please wait ..."
113+
echo "Formatting linux partition (ext4), please wait ..."
114114
mkfs.ext4 -L linux ${sdcard}p2 > /dev/null 2>&1
115115
if [ $? -ne 0 ]; then
116-
echo "ERROR formating ext4 partition."
116+
echo "ERROR formatting ext4 partition."
117117
exit 1
118118
fi
119119
fi

‎install_xfce_desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ echo ""
2020
# Check if we have enough disk space.
2121
S=`df / | tail -n 1 | awk '{printf $4}' | sed s/[G,M,K]//g`
2222
if [ "$S" -le "500000" ]; then
23-
echo "We need at least 500MB free to perform minimal desktop instalation"
23+
echo "We need at least 500MB free to perform minimal desktop installation"
2424
echo "Have you resized your partition (fs_resize)?"
2525
exit 0
2626
fi

‎params.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
# *****************************************************
8-
# Set to "yes" to create realy minimal image *
8+
# Set to "yes" to create really minimal image *
99
# *****************************************************
1010
ONLY_BASE="no"
1111

@@ -37,21 +37,22 @@ LANG="en_US.UTF-8"
3737

3838
# *****************************************************
3939
# Set the base name of your image. *
40-
# Distro name is automaticaty appended, and the image *
41-
# will be "image_name-distro.img" *
40+
# Distro name is automatically appended, and the *
41+
# image will be "image_name-distro.img". *
4242
# --------------------------------------------------- *
4343
# IF image_name="", image file won't be created, *
44-
# instalation will be created in local directories *
44+
# installation will be created in local directories *
4545
# linux-$distro & boot-$distro *
4646
# YOU CAN CREATE THE IMAGE LATER RUNNING: *
4747
# sudo ./image_from_dir <directory> <DEVICE|IMAGE> *
4848
# === IT IS THE RECOMMENDED WAY OF IMAGE CREATION === *
4949
# --------------------------------------------------- *
5050
# IF image_name is BLOCK DEVICE (/dev/sdXn) *
5151
# LINUX filesystem will be created directly on it *
52-
# Partition must exist ! *
52+
# partition must exist! *
5353
# IF _format="" partition will NOT be formated *
54-
# otherwyse it will be formated with specified format *
54+
# otherwise it will be formatted with specified *
55+
# format. *
5556
# *****************************************************
5657
image_name=""
5758
#image_name="minimal"
@@ -119,7 +120,7 @@ _compress="yes"
119120
# IF YOU WANT TO HAVE BOOT FILES ON EXT4 PARTITION =
120121
# AND NOT ON SEPARATE FAT16 PARTITION =
121122
# set _boot_on_ext4="yes" and =
122-
# FAT partitin won't be created =
123+
# FAT partition won't be created =
123124
# --------------------------------------------------- =
124125
# DO NOT CHANGE FOR NOW ! =
125126
# =====================================================

‎second-stage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ chown -R $USER:$USER /home/$USER
466466
rm /usr/sbin/policy-rc.d
467467

468468
echo ""
469-
echo "Instalation finished."
469+
echo "Installation finished."
470470
echo ""
471471
touch /_OK_
472472

0 commit comments

Comments
 (0)