Merge branch 'grigruss'

Author: grigruss

README.md

@@ -3,8 +3,14 @@ Bash script with interactive terminal shell for 'dd'
 
 Get release zip, extract and ...
 ```
-# Run idd.sh as root
-sudo ./idd.sh
+# Go to extracted directory
+cd interactive-dd
+
+# Copy idd.sh to /usr/bin as root
+sudo cp idd.sh /usr/bin/idd
+
+# Copy translations to /usr/share/idd/
+sudo cp translations/*.trans /usr/share/idd/
 
 # After that:
 # Just run idd in directory with image-file

idd.sh

@@ -10,29 +10,12 @@
 # Лицензия MIT, читайте файл LICENSE.md
 
 # Check root
-if [[ `whoami` != "root" ]]; then echo -e "Run as root! You have no rights."; exit 2; fi
-
-# Check localisation file
-if [[ ! -e "/usr/share/idd/idd.${LANG:0:2}" ]]; then
-	if [[ -e "./lang/idd.${LANG:0:2}" ]]; then
-		mkdir "/usr/share/idd"
-		cp ./lang/* /usr/share/idd/
-		cp $0 /usr/bin/idd
-		echo "idd.sh installed successful!"
-		echo "Run just 'idd' without '.sh'."
-		exit 0
-	else
-		echo "Localisation files not found. Please download release archive from"
-		echo "https://github.com/grigruss/interactive-dd/releases"
-		echo "Extract and run 'idd.sh' from extracted directory."
-		exit 2
-	fi
-fi
+if [[ `whoami` != "root" ]]; then echo -e "\n\t\e[33;5mRun as root! You have no rights.\e[0m\n"; exit 2; fi
 
 # Load locales
 IFS=$'\n'
 iddlocale=
-for line in $(cat "/usr/share/idd/idd.${LANG:0:2}"); do
+for line in $(cat "/usr/share/idd/${LANG:0:2}.trans"); do
 	idx1=`expr index "$line" =`
 	idx=`expr $idx1 - 1`
 	nm="${line:0:$idx}"
@@ -53,7 +36,7 @@ list=	# For lists of files/disks | Для списков файлов/диско
 # Рисует шапку/заголовок
 field(){
 	echo -e "\e[37;45m\e[2J\e[1;0H"
-	echo -e "$idd_header"
+	echo -e "$idd_header dd (v0.4.1)\e[0m\e[37;45;1m"
 	echo -e "$idd_target"
 	echo -e "$idd_target1"
 	echo -e "$idd_thankfulness"
@@ -76,7 +59,7 @@ chs1(){
 	else
 		showdevices
 	fi
-	echo -e "$idd_read_source_dest"
+	echo -e "$idd_read_source_dest $d$idd_read_source_dest1"
 	read file
 	sl="${#list[*]}"
 	if [[ $d == "$idd_choise_f" && $file == $sl ]]; then
@@ -109,10 +92,10 @@ chs2(){
 	esac
 	if [[ $d == $idd_choise_d ]]; then
 		showdevices
-		echo -e "$idd_read_source_dest"
+		echo -e "$idd_read_source_dest $d$idd_read_source_dest1"
 		read file
 	else
-		echo -e "$idd_type_filename"
+		echo -e "$idd_type_filename $d$idd_type_filename1"
 		read ff
 		if [[ -e "$ff" && $ff != "/dev/null" ]]; then
 			echo -e "$idd_file_exists_exit"; exit 2
@@ -130,13 +113,15 @@ chs2(){
 # Вывод нумерованного списка файлов в текущей директории
 showfiles(){
 	echo -e "$idd_filelist"
-	flist=(`ls *.i*`)
 	count=1
-	for file in ${flist[*]}; do
-		echo -e "\t\t$count) $file"
-		list[$count]=$file
-		count=`expr $count + 1`
-	done
+	if [[ -e *.i* ]]; then
+		flist=(`ls *.i*`)
+		for file in ${flist[*]}; do
+			echo -e "\t\t$count) $file"
+			list[$count]=$file
+			count=`expr $count + 1`
+		done
+	fi
 	echo -e "\t\t$count$idd_type_from_kbd"
 }
 
@@ -167,6 +152,7 @@ showdevices(){
 # Get device block size
 # Определение размера блока
 getbs(){
+	if [[ ! -e /sys/block/$bsdev/queue/logical_block_size ]]; then bs=; return; fi
 	bsdev=
 	if [[ ${odev:0:4} == "/dev" ]]; then bsdev="${odev:5}"; else bsdev="no"; return; fi
 	blocksize=`cat /sys/block/$bsdev/queue/logical_block_size`
@@ -189,7 +175,7 @@ showdata(){
 	field
 	echo -e "\e[30;47m\e[12H\e[0J"
 	echo -e "$idd_source_choised\t$idev"
-	echo -e "$idd_dest_choised$odev\t$mnt\e[0m\e[30;47m"
+	echo -e "$idd_dest_choised\t$odev\t$mnt\e[0m\e[30;47m"
 	echo -e "$idd_bs\t$bs"
 	if [[ ! $bs ]]; then pbs=""; else pbs="bs=$bs "; fi
 	echo -e "$idd_command\e[30;43m dd if=$idev of=$odev ${pbs}status=progress \e[0m\e[30;47m"

lang/idd.en translations/en.translang/idd.en renamed to translations/en.trans

@@ -11,7 +11,8 @@ idd_choise_f=file
 idd_choise_d=disk
 idd_choise_source1=\e[1D\e[0K\t\t\e[34mf) File\t\e[30md) Disk
 idd_choise_source2=\e[1D\e[0K\t\tf) File\t\e[34md) Disk\e[30m
-idd_read_source_dest=\tSelect the number of $d and press Enter
+idd_read_source_dest=\tSelect the number of
+idd_read_source_dest1= and press Enter
 idd_type_filename=\tType name of
 idd_type_filename1=:
 idd_file_exists=\tFile exists.

lang/idd.ru translations/ru.translang/idd.ru renamed to translations/ru.trans

@@ -1,17 +1,18 @@
 # Rissuan UTF-8 locale
 
-idd_header=\e[37;45;4m\tИНТЕРАКТИВНАЯ ОБОЛОЧКА КОМАНДЫ dd (v0.4)\e[0m\e[37;45;1m
+idd_header=\e[37;45;4m\tИНТЕРАКТИВНАЯ ОБОЛОЧКА КОМАНДЫ
 idd_target=\e[37;45;1m    \e[4mВ целях:\e[0m\e[37;45;1m\n\tРоссийского Общества Свободного Программного Обеспечения (РОСПО)
 idd_target1=\e[37;45;1m\tДля развития и улучшения качества российского СПО.
-idd_thankfulness=\e[37;45;1m    \e[4mБлагодарность за консультации:\e[0m\e[37;45;1m\n\tМихаилу (vk.com/mikhailnov) и Сергею (vk.com/disable_enable)
+idd_thankfulness=\e[37;45;1m    \e[4mБлагодарность за консультации и помощь:\e[0m\e[37;45;1m\n\tМихаилу (vk.com/mikhailnov), Сергею (vk.com/disable_enable) и Данилу (vk.com/danil.antoshkin)
 idd_author_lic=\e[37;45;1m\n\tya@grigrus.ru vk.com/nixscript\n\t\t License MIT \n\e[0m\e[47m\e[0J
 
 idd_choise_source=\e[30;47m\e[12H\e[0J\t\e[30mВыберите источник\n\t\tf) Файл\td) Диск\e[1A
 idd_choise_f=файл
 idd_choise_d=диск
 idd_choise_source1=\e[1D\e[0K\t\t\e[34mf) Файл\t\e[30md) Диск
 idd_choise_source2=\e[1D\e[0K\t\tf) Файл\t\e[34md) Диск\e[30m
-idd_read_source_dest=\tВыберите номер $dа и нажмите Enter
+idd_read_source_dest=\tВыберите номер
+idd_read_source_dest1=а и нажмите Enter
 idd_type_filename=\tВведите имя
 idd_type_filename1=а:
 idd_file_exists=\tФайл найден.