Hello community,
here is the log from the commit of package WoeUSB for openSUSE:Factory checked
in at 2018-03-30 12:07:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/WoeUSB (Old)
and /work/SRC/openSUSE:Factory/.WoeUSB.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "WoeUSB"
Fri Mar 30 12:07:50 2018 rev:4 rq:592195 version:3.1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/WoeUSB/WoeUSB.changes 2018-03-20
22:00:28.813422410 +0100
+++ /work/SRC/openSUSE:Factory/.WoeUSB.new/WoeUSB.changes 2018-03-30
12:07:54.580677657 +0200
@@ -1,0 +2,21 @@
+Thu Mar 29 05:43:11 UTC 2018 - guoyunhebr...@gmail.com
+
+- Version 3.1.5
+ * Packaging: Debian: Downgrade debian/compat to 9 to match debian/control
+ * Packaging: Debian: Downgrade debhelper dependency to v9 to support Ubuntu
14.04(till April 2019)
+ * Packaging: Debian: Add missing build dependency: dh-autoreconf
+ * Packaging: Debian: Depend on grub2-common instead of grub-common
+ * Packaging: Debian: Add gettext package as build dependencies
+ * Merge branch 'master' of github.com:slacka/WoeUSB
+ * Manpages: woeusbgui(1): Fix typo
+ * Add VCS- fields to debian/control
+ * Remove versioned dependencies where satisfied by all releases since
oldoldstable (Wheezy)
+ * Remove dependencies on essential packages as they're always there
+ * Fix priority-extra-is-replaced-by-priority-optional
+ * Bump Debian Standards Version to 4.1.1
+ * build-depends-on-1-revision build-depends: coreutils (>= 8.23-1)
+ * Remove trailing whitespace
+ * Fix obsolete-relation-form-in-source in woeusb depends: bash (>4.3)
+ * core: Eliminate abused double quotes
+
+-------------------------------------------------------------------
Old:
----
WoeUSB-3.1.4.tar.gz
New:
----
WoeUSB-3.1.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ WoeUSB.spec ++++++
--- /var/tmp/diff_new_pack.Pa7Cp2/_old 2018-03-30 12:07:55.112658423 +0200
+++ /var/tmp/diff_new_pack.Pa7Cp2/_new 2018-03-30 12:07:55.112658423 +0200
@@ -17,7 +17,7 @@
Name: WoeUSB
-Version: 3.1.4
+Version: 3.1.5
Release: 0
Summary: Windows USB installation media creator
License: GPL-3.0-or-later
++++++ WoeUSB-3.1.4.tar.gz -> WoeUSB-3.1.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/WoeUSB-3.1.4/debian/changelog
new/WoeUSB-3.1.5/debian/changelog
--- old/WoeUSB-3.1.4/debian/changelog 2017-11-12 07:43:44.000000000 +0100
+++ new/WoeUSB-3.1.5/debian/changelog 2018-03-19 22:28:23.000000000 +0100
@@ -3,5 +3,5 @@
* This is a fake changelog for packaging purpose, for the actual changelog
pl-
ease refer Commits · slacka/WoeUSB
<https://github.com/slacka/WoeUSB/commits>
-
- -- 林博仁 (Buo-Ren, Lin) <buo.ren....@gmail.com> Mon, 12 Jun 2017 09:04:00 +0100
+
+ -- 林博仁 (Buo-Ren, Lin) <buo.ren....@gmail.com> Wed, 15 Nov 2017 09:04:00 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/WoeUSB-3.1.4/debian/compat
new/WoeUSB-3.1.5/debian/compat
--- old/WoeUSB-3.1.4/debian/compat 2017-11-12 07:43:44.000000000 +0100
+++ new/WoeUSB-3.1.5/debian/compat 2018-03-19 22:28:23.000000000 +0100
@@ -1 +1 @@
-10
+9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/WoeUSB-3.1.4/debian/control
new/WoeUSB-3.1.5/debian/control
--- old/WoeUSB-3.1.4/debian/control 2017-11-12 07:43:44.000000000 +0100
+++ new/WoeUSB-3.1.5/debian/control 2018-03-19 22:28:23.000000000 +0100
@@ -1,28 +1,29 @@
Source: woeusb
Homepage: https://github.com/slacka/WoeUSB
Section: utils
-Priority: extra
+Priority: optional
Maintainer: 林博仁 (Buo-Ren, Lin) <buo.ren....@gmail.com>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
git-core,
- libwxgtk2.8-dev (>= 2.8.4) | libwxgtk3.0-dev,
- realpath | coreutils (>= 8.23-1)
-Standards-Version: 3.8.1
+ libwxgtk2.8-dev | libwxgtk3.0-dev,
+ realpath | coreutils (>= 8.23)
+Standards-Version: 4.1.1
+Vcs-Browser: https://github.com/slacka/WoeUSB/
+Vcs-Git: https://github.com/slacka/WoeUSB.git
Package: woeusb
Architecture: any
-Depends: bash (>4.3),
+Depends: bash (>=4.3),
dosfstools,
- findutils,
- grep,
- grub-common,
+ gettext,
+ grub2-common,
grub-pc-bin,
- ntfsprogs | ntfs-3g (>= 1:2011),
+ ntfsprogs | ntfs-3g,
p7zip-full,
parted,
policykit-1,
realpath | coreutils (>= 8.23),
- util-linux,
wget,
${misc:Depends},
${shlibs:Depends}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/WoeUSB-3.1.4/debian/rules
new/WoeUSB-3.1.5/debian/rules
--- old/WoeUSB-3.1.4/debian/rules 2017-11-12 07:43:44.000000000 +0100
+++ new/WoeUSB-3.1.5/debian/rules 2018-03-19 22:28:23.000000000 +0100
@@ -5,4 +5,4 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
- dh $@ --with autoreconf
+ dh $@ --with autoreconf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/WoeUSB-3.1.4/src/woeusb new/WoeUSB-3.1.5/src/woeusb
--- old/WoeUSB-3.1.4/src/woeusb 2017-11-12 07:43:44.000000000 +0100
+++ new/WoeUSB-3.1.5/src/woeusb 2018-03-19 22:28:23.000000000 +0100
@@ -36,7 +36,7 @@
for critical_command in realpath basename dirname mktemp; do
if ! command -v "${critical_command}" &> /dev/null; then
- echo "Fatal: This program requires GNU Coreutils in the
executable search path"
+ echo 'Fatal: This program requires GNU Coreutils in the
executable search path'
exit 1
fi
done
@@ -89,7 +89,7 @@
## Execution state for cleanup functions to determine if clean up is required
## NOTE: Need to pass to traps, so need to be global
-declare current_state="pre-init"
+declare current_state='pre-init'
## For some reason alias won't be recognized in function if it's definition's
LINENO is greater then it's reference in function, so we define it here:
alias\
@@ -112,12 +112,12 @@
local -r runtime_executable_name="$1"; shift
local -n only_for_gui_ref="$1"
- declare -r application_name="WoeUSB"
- declare -r application_version="@@WOEUSB_VERSION@@"
+ declare -r application_name='WoeUSB'
+ declare -r application_version='@@WOEUSB_VERSION@@'
- declare -r DEFAULT_NEW_FS_LABEL="Windows USB"
+ declare -r DEFAULT_NEW_FS_LABEL='Windows USB'
- current_state="enter-init"
+ current_state='enter-init'
local\
flag_print_help=N\
@@ -125,7 +125,7 @@
flag_print_about=N\
local -r \
- application_site_url="https://github.com/slacka/WoeUSB"\
+ application_site_url='https://github.com/slacka/WoeUSB'\
application_copyright_declaration="Copyright © Colin GILLE /
congelli501 2013\\nCopyright © slacka et.al. 2017"\
application_copyright_notice="${application_name} is free
software licensed under the GNU General Public License version 3(or any later
version of your preference) that gives you THE 4 ESSENTIAL
FREEDOMS\\nhttps://www.gnu.org/philosophy/";
local install_mode
@@ -138,9 +138,9 @@
local target_partition
- local workaround_bios_boot_flag="N"
+ local workaround_bios_boot_flag='N'
- local target_filesystem_type="FAT"
+ local target_filesystem_type='FAT'
source_fs_mountpoint="/media/woeusb_source_$(date +%s)_$$"
target_fs_mountpoint="/media/woeusb_target_$(date +%s)_$$"
@@ -238,7 +238,7 @@
"${target_device}"
create_target_partition_table\
"${target_device}"\
- "legacy"
+ 'legacy'
create_target_partition\
"${target_partition}"\
"${target_filesystem_type}"\
@@ -246,7 +246,7 @@
"${command_mkdosfs}"\
"${command_mkntfs}"
- if [ "${target_filesystem_type}" == "NTFS" ]; then
+ if [ "${target_filesystem_type}" == 'NTFS' ]; then
create_uefi_ntfs_support_partition\
"${target_device}"
install_uefi_ntfs_support_partition\
@@ -263,12 +263,12 @@
"${target_device}"
fi
- current_state="start-mounting"
+ current_state='start-mounting'
if ! mount_source_filesystem\
"${source_media}"\
"${source_fs_mountpoint}"; then
- echo_with_color red "Error: Unable to mount source filesystem"
+ echo_with_color red 'Error: Unable to mount source filesystem'
exit 1
fi
@@ -276,7 +276,7 @@
"${target_partition}"\
"${target_fs_mountpoint}"\
vfat; then
- echo_with_color red "Error: Unable to mount target filesystem"
+ echo_with_color red 'Error: Unable to mount target filesystem'
exit 1
fi
@@ -285,7 +285,7 @@
"${source_fs_mountpoint}"\
|| exit 1
- current_state="copying-filesystem"
+ current_state='copying-filesystem'
workaround_linux_make_writeback_buffering_not_suck\
apply
@@ -308,12 +308,12 @@
"${target_fs_mountpoint}"\
"${name_grub_prefix}"
- if [ "${workaround_bios_boot_flag}" == "Y" ]; then
+ if [ "${workaround_bios_boot_flag}" == 'Y' ]; then
workaround_buggy_motherboards_that_ignore_disks_without_boot_flag_toggled\
"${target_device}"
fi
- current_state="finished"
+ current_state='finished'
trigger_wxGenericProgressDialog_pulse\
off\
@@ -334,60 +334,60 @@
echo -e "======================================"
echo -e "${application_name} can create a bootable Microsoft Windows(R)
USB storage device from an existing Windows optical disk or an ISO disk image."
echo -e
- echo -e "Currently two creation methods are supported:"
+ echo -e 'Currently two creation methods are supported:'
echo -e
echo -e ' --device, -d'
echo -e
- echo -e ' '"Completely WIPE the entire USB storage
device, then build a bootable Windows USB device from scratch."
- echo -e ' '"WARNING: All previous data on the device will
be gone!"
+ echo -e ' ''Completely WIPE the entire USB storage
device, then build a bootable Windows USB device from scratch.'
+ echo -e ' ''WARNING: All previous data on the device will
be gone!'
echo -e
echo -e ' '"${runtime_executable_name} --device <source
media path> <device>"
- echo -e ' '"Examples:"
+ echo -e ' ''Examples:'
echo -e ' '"- ${runtime_executable_name} --device
Windows7_x64.iso /dev/sdX"
echo -e ' '"- ${runtime_executable_name} --device
/dev/sr0 /dev/sdX"
echo -e
echo -e ' --partition, -p'
echo -e
- echo -e ' '"Copy Windows files to an existing partition
of a USB storage device and make it bootable. This allows files to coexist as
long as no filename conflict exists."
- echo -e ' '"WARNING: All files that has the same name
will be overwritten!"
+ echo -e ' ''Copy Windows files to an existing partition
of a USB storage device and make it bootable. This allows files to coexist as
long as no filename conflict exists.'
+ echo -e ' ''WARNING: All files that has the same name
will be overwritten!'
echo -e
echo -e ' '"${runtime_executable_name} --partition
<source media path> <partition>"
- echo -e ' '"Examples:"
+ echo -e ' ''Examples:'
echo -e ' '"- ${runtime_executable_name} --partition
Windows7_x64.iso /dev/sdX1"
echo -e ' '"- ${runtime_executable_name} --partition
/dev/sr0 /dev/sdX1"
echo -e
- echo -e '## '"Command-line Options"' ##'
+ echo -e '## ''Command-line Options'' ##'
echo -e ' --verbose, -v'
- echo -e ' '"Verbose mode"
+ echo -e ' ''Verbose mode'
echo -e
echo -e ' --help, -h'
- echo -e ' '"Show this help message and exit"
+ echo -e ' ''Show this help message and exit'
echo -e
echo -e ' --version, -V'
- echo -e ' '"Print application version"
+ echo -e ' ''Print application version'
echo -e
echo -e ' --about, -ab'
- echo -e ' '"Show info about this application"
+ echo -e ' ''Show info about this application'
echo -e
echo -e ' --no-color'
- echo -e ' '"Disable message coloring"
+ echo -e ' ''Disable message coloring'
echo -e
echo -e ' --debug'
- echo -e ' '"Enable script debugging"
+ echo -e ' ''Enable script debugging'
echo -e
echo -e ' --label, -l <filesystem_label>'
- echo -e ' '"Specify label for the newly created file
system in --device creation method"
- echo -e ' '"Note that the label is not verified for
validity and may be illegal for the filesystem"
+ echo -e ' ''Specify label for the newly created file
system in --device creation method'
+ echo -e ' ''Note that the label is not verified for
validity and may be illegal for the filesystem'
echo -e
echo -e ' --workaround-bios-boot-flag'
echo -e ' '"Workaround BIOS bug that won't include the
device in boot menu if non of the partition's boot flag is toggled"
echo -e
echo -e ' --debugging-internal-function-call <function name>
(function_argument)...'
- echo -e ' '"Development option for developers to test
certain function without running the entire build"
+ echo -e ' ''Development option for developers to test
certain function without running the entire build'
echo -e
echo -e ' --target-filesystem, --tgt-fs <filesystem name>'
echo -e ' '"Specify the filesystem to use as the target
partition's filesystem."
- echo -e ' '"Currently supported: FAT(default)/NTFS"
+ echo -e ' ''Currently supported: FAT(default)/NTFS'
echo -e
}; declare -fr print_help
@@ -474,7 +474,7 @@
shift_array parameters
if [ "${#parameters[@]}" -lt 2 ]; then
echo_with_color\
- "red"\
+ 'red'\
"${FUNCNAME[0]}: Error:
--partition option requires 2 arguments!"
return 1
fi
@@ -492,7 +492,7 @@
shift_array parameters
if [ "${#parameters[@]}" -lt 2 ]; then
echo_with_color\
- "red"\
+ 'red'\
"${FUNCNAME[0]}: Error:
--device option requires 2 arguments!"
return 1
fi
@@ -518,14 +518,14 @@
red\
'%s: %s\n'\
"${FUNCNAME[0]}"\
- "ERROR: --label option requires
at least 1 argument."
+ 'ERROR: --label option requires
at least 1 argument.'
return 1
fi
new_file_system_label_ref="${parameters[0]}"
;;
--workaround-bios-boot-flag)
enable_workaround_bios_boot_flag=Y
- workaround_bios_boot_flag_ref="Y"
+ workaround_bios_boot_flag_ref='Y'
;;
--debugging-internal-function-call)
enable_debugging_internal_function_call=Y
@@ -536,7 +536,7 @@
red\
'%s: %s\n'\
"${FUNCNAME[0]}"\
- "ERROR:
--debugging-internal-function-call option requires at least 1 argument."
+ 'ERROR:
--debugging-internal-function-call option requires at least 1 argument.'
return 1
fi
"${parameters[@]}"
@@ -552,7 +552,7 @@
red\
'%s: %s\n'\
"${FUNCNAME[0]}"\
- "ERROR: --target-filesystem
option requires at least 1 argument."
+ 'ERROR: --target-filesystem
option requires at least 1 argument.'
return 1
fi
target_filesystem_type_ref="${parameters[0]}"
@@ -598,7 +598,7 @@
return 1
fi
- if [ "${verbose}" = "1" ] && [ "${enable_debug}" != "Y" ]; then
+ if [ "${verbose}" = '1' ] && [ "${enable_debug}" != 'Y' ]; then
trap 'trap_return "${FUNCNAME[0]}"' RETURN
# Disabled due to FIXME
@@ -606,7 +606,7 @@
fi
# Always be the last condition so that less debug message from this
function will be printed
- if [ "${enable_debug}" = "Y" ]; then
+ if [ "${enable_debug}" = 'Y' ]; then
set -o xtrace
fi
return 0
@@ -658,7 +658,7 @@
local -n command_grubinstall_ref="$1"; shift
local -n name_grub_prefix_ref="$1"
- local result="unknown"
+ local result='unknown'
for required_command in\
awk\
@@ -700,7 +700,7 @@
"${FUNCNAME[0]}: Error:
mkdosfs/mkfs.msdos/mkfs.vfat/mkfs.fat command not found!" >&2
echo_with_color red\
"${FUNCNAME[0]}: Error: Please make sure that
dosfstools is properly installed!" >&2
- result="failed"
+ result='failed'
fi
if command -v 'mkntfs' &>/dev/null; then
@@ -710,22 +710,22 @@
'%s\n%s\n'\
"${FUNCNAME[0]}: Error: mkntfs command not found!"\
"${FUNCNAME[0]}: Error: Please make sure that ntfs-3g
is properly installed!"
- result="failed"
+ result='failed'
fi
if command -v 'grub-install' &> /dev/null; then
command_grubinstall_ref='grub-install'
- name_grub_prefix_ref="grub"
+ name_grub_prefix_ref='grub'
elif command -v 'grub2-install' &> /dev/null; then
command_grubinstall_ref='grub2-install'
- name_grub_prefix_ref="grub2"
+ name_grub_prefix_ref='grub2'
else
echo_with_color red "${FUNCNAME[0]}: Error: grub-install or
grub2-install command not found!" >&2
echo_with_color red "${FUNCNAME[0]}: Error: Please make sure
that GNU GRUB is properly installed!" >&2
- result="failed"
+ result='failed'
fi
- if [ "${result}" == "failed" ]; then
+ if [ "${result}" == 'failed' ]; then
return 1
else
return 0
@@ -741,7 +741,7 @@
yellow\
'%s\n%s\n'\
"Warning: You are not running ${application_name} as
root!"\
- "Warning: This might be the reason of the following
failure." >&2
+ 'Warning: This might be the reason of the following
failure.' >&2
fi
return 0
}; declare -fr check_permission
@@ -892,10 +892,10 @@
case "${partition_table_type}" in
legacy|msdos|mbr|pc)
- parted_partiton_table_argument="msdos"
+ parted_partiton_table_argument='msdos'
;;
gpt|guid)
- parted_partiton_table_argument="gpt"
+ parted_partiton_table_argument='gpt'
echo_with_color\
red\
"${FUNCNAME[0]}: Error: Currently GUID
partition table is not supported."
@@ -924,13 +924,13 @@
printf_with_color\
green\
'%s\n'\
- "Making system realize that partition table has changed..."
+ 'Making system realize that partition table has changed...'
blockdev\
--rereadpt\
"${target_device}"\
|| true
- echo "Wait 3 seconds for block device nodes to populate..."
+ echo 'Wait 3 seconds for block device nodes to populate...'
sleep 3
}; declare -fr workaround_make_system_realize_partition_table_changed
@@ -948,10 +948,10 @@
local parted_mkpart_fs_type
case "${filesystem_type}" in
FAT|vfat)
- parted_mkpart_fs_type="fat32"
+ parted_mkpart_fs_type='fat32'
;;
NTFS|ntfs)
- parted_mkpart_fs_type="ntfs"
+ parted_mkpart_fs_type='ntfs'
;;
*)
echo_with_color red "${FUNCNAME[0]}: Error: Filesystem
not supported"
@@ -1145,7 +1145,7 @@
"${target_device}"\
| grep\
--silent\
- "UEFI_NTFS"; then
+ 'UEFI_NTFS'; then
printf_with_color yellow\
'%s: %s\n'\
"${FUNCNAME[0]}"\
@@ -1153,7 +1153,7 @@
printf --\
'%s: %s\n'\
"${FUNCNAME[0]}"\
- "Info: You may recreate disk with an UEFI:NTFS
partition by using the --device creation method"
+ 'Info: You may recreate disk with an UEFI:NTFS
partition by using the --device creation method'
fi
}; declare -fr check_uefi_ntfs_support_partition
@@ -1162,7 +1162,7 @@
local source_media="$1"; shift
local source_fs_mountpoint="$1"
- echo_with_color green "Mounting source filesystem..."
+ echo_with_color green 'Mounting source filesystem...'
mkdir\
--parents\
@@ -1203,9 +1203,9 @@
local target_fs_mountpoint="$1"; shift
local target_fs_type="$1"
- local mount_options="defaults"
+ local mount_options='defaults'
- echo_with_color green "Mounting target filesystem..."
+ echo_with_color green 'Mounting target filesystem...'
mkdir\
--parents\
@@ -1276,7 +1276,7 @@
((needed_space = needed_space +
additional_space_required_for_grub_installation))
if [ "${needed_space}" -gt "${free_space}" ]; then
- echo "Error: Not enough free space on target partition!" >&2
+ echo 'Error: Not enough free space on target partition!' >&2
echo "Error: We required
${needed_space_human_readable}(${needed_space} bytes) but '${target_partition}'
only has ${free_space_human_readable}(${free_space} bytes)." >&2
return 1
fi
@@ -1303,7 +1303,7 @@
off\
"${only_for_gui}"
- echo_with_color green "Copying files from source media..."
+ echo_with_color green 'Copying files from source media...'
pushd "${source_fs_mountpoint}" >/dev/null
@@ -1426,8 +1426,8 @@
return 0
fi
- echo_with_color yellow "Source media seems to be Windows 7-based with
EFI support, applying workaround to make it support UEFI booting"
- if ! command -v "7z" >/dev/null 2>&1; then
+ echo_with_color yellow 'Source media seems to be Windows 7-based with
EFI support, applying workaround to make it support UEFI booting'
+ if ! command -v '7z' >/dev/null 2>&1; then
echo_with_color yellow "Warning: '7z' utility not found,
workaround is not applied." >&2
return 0
fi
@@ -1443,7 +1443,7 @@
)"
if [ -z "${test_efi_directory}" ]; then
efi_directory="${target_fs_mountpoint}/efi"
- if [ "${verbose}" = "1" ]; then
+ if [ "${verbose}" = '1' ]; then
printf --\
"%s: DEBUG: Can't find efi directory, use
%s.\\n"\
"${FUNCNAME[0]}"\
@@ -1451,7 +1451,7 @@
fi
else # efi directory(case don't care) exists
efi_directory="${test_efi_directory}"
- if [ "${verbose}" = "1" ]; then
+ if [ "${verbose}" = '1' ]; then
printf --\
'%s: DEBUG: %s detected.\n'\
"${FUNCNAME[0]}"\
@@ -1470,7 +1470,7 @@
)"
if [ -z "${test_efi_boot_directory}" ]; then
efi_boot_directory="${efi_directory}/boot"
- if [ "${verbose}" = "1" ]; then
+ if [ "${verbose}" = '1' ]; then
printf --\
"%s: DEBUG: Can't find efi/boot directory, use
%s.\\n"\
"${FUNCNAME[0]}"\
@@ -1478,7 +1478,7 @@
fi
else # boot directory(case don't care) exists
efi_boot_directory="${test_efi_boot_directory}"
- if [ "${verbose}" = "1" ]; then
+ if [ "${verbose}" = '1' ]; then
printf --\
'%s: DEBUG: %s detected.\n'\
"${FUNCNAME[0]}"\
@@ -1556,7 +1556,7 @@
local -r target_device="${1}"; shift 1
local -r command_grubinstall="${1}"
- echo_with_color green "Installing GRUB bootloader for legacy PC booting
support..."
+ echo_with_color green 'Installing GRUB bootloader for legacy PC booting
support...'
"${command_grubinstall}"\
--target=i386-pc\
--boot-directory="${target_fs_mountpoint}"\
@@ -1574,7 +1574,7 @@
local -r target_fs_mountpoint="$1"; shift
local -r name_grub_prefix="$1"
- echo_with_color green "Installing custom GRUB config for legacy PC
booting..."
+ echo_with_color green 'Installing custom GRUB config for legacy PC
booting...'
local -r grub_cfg="${target_fs_mountpoint}/${name_grub_prefix}/grub.cfg"
local target_fs_uuid; target_fs_uuid=$(
lsblk\
@@ -1607,7 +1607,7 @@
local -r target_fs_mountpoint="${1}"; shift
local -ir only_for_gui="${1}"
- local clean_result="unknown"
+ local clean_result='unknown'
# FIXME: Why `trigger_wxGenericProgressDialog_pulse off` here?
trigger_wxGenericProgressDialog_pulse\
@@ -1623,11 +1623,11 @@
if umount "${source_fs_mountpoint}"; then
if ! rmdir "${source_fs_mountpoint}"; then
echo_with_color yellow "${FUNCNAME[0]}:
Warning: Unable to remove source mountpoint"
- clean_result="unclean"
+ clean_result='unclean'
fi
else
echo_with_color yellow "${FUNCNAME[0]}: Warning: Unable
to unmount source filesystem."
- clean_result="unclean"
+ clean_result='unclean'
fi
fi
@@ -1636,17 +1636,17 @@
if umount "${target_fs_mountpoint}"; then
if ! rmdir "${target_fs_mountpoint}"; then
echo_with_color yellow "${FUNCNAME[0]}:
Warning: Unable to remove target mountpoint"
- clean_result="unclean"
+ clean_result='unclean'
fi
else
echo_with_color yellow "${FUNCNAME[0]}: Warning: Unable
to unmount target filesystem."
- clean_result="unsafe"
+ clean_result='unsafe'
fi
fi
- if [ "${clean_result}" == "unclean" ]; then
+ if [ "${clean_result}" == 'unclean' ]; then
return 2
- elif [ "${clean_result}" == "unsafe" ]; then
+ elif [ "${clean_result}" == 'unsafe' ]; then
return 3
else
return 0
@@ -1724,11 +1724,11 @@
"${target_fs_mountpoint}"\
"${global_only_for_gui}"; then
:
- elif [ "${?}" == "2" ]; then
- echo_with_color yellow "Some mountpoints are not
unmount/cleaned successfully and must be done manually"
+ elif [ "${?}" == '2' ]; then
+ echo_with_color yellow 'Some mountpoints are not
unmount/cleaned successfully and must be done manually'
else # $? == 3, target filesystem not unmounted
- echo_with_color yellow "We unable to unmount target
filesystem for you, please make sure target filesystem is unmounted before
detaching to prevent data corruption"
- echo_with_color yellow "Some mountpoints are not
unmount/cleaned successfully and must be done manually"
+ echo_with_color yellow 'We unable to unmount target
filesystem for you, please make sure target filesystem is unmounted before
detaching to prevent data corruption'
+ echo_with_color yellow 'Some mountpoints are not
unmount/cleaned successfully and must be done manually'
fi
fi
@@ -1736,9 +1736,9 @@
util_is_parameter_set_and_not_empty\
target_device; then
if is_target_busy "${target_device}"; then
- echo_with_color yellow "Target device is busy, please
make sure you unmount all filesystems on target device or shutdown the computer
before detaching it."
+ echo_with_color yellow 'Target device is busy, please
make sure you unmount all filesystems on target device or shutdown the computer
before detaching it.'
else
- echo_with_color green "You may now safely detach the
target device"
+ echo_with_color green 'You may now safely detach the
target device'
fi
fi
@@ -1746,9 +1746,9 @@
--recursive\
"${temp_directory}"
- if [ "${current_state}" = "finished" ]; then
- echo_with_color green "Done :)"
- echo_with_color green "The target device should be bootable now"
+ if [ "${current_state}" = 'finished' ]; then
+ echo_with_color green 'Done :)'
+ echo_with_color green 'The target device should be bootable now'
fi
return 0
@@ -1756,7 +1756,7 @@
trap_interrupt(){
printf '\n' # Separate message with previous output
- echo_with_color yellow "Recieved SIGINT, program is interrupted." 1>&2
+ echo_with_color yellow 'Recieved SIGINT, program is interrupted.' 1>&2
return 1
}; declare -fr trap_interrupt
@@ -1792,10 +1792,10 @@
done
case "$(type -t "${command_base}")" in
- "file")
+ 'file')
echo_with_color green "${FUNCNAME[0]}: INFO: Executing
${command_to_be_executed}"
;;
- "function")
+ 'function')
echo_with_color green "${FUNCNAME[0]}: INFO: Calling
${command_base}"
;;
*)
@@ -1814,7 +1814,7 @@
local command_output
local -i command_exit_status
if command_output="$( "${command[@]}" 2>&1 )"; then
- command_exit_status="0"
+ command_exit_status='0'
else
command_exit_status="$?"
fi
@@ -1823,24 +1823,24 @@
echo_with_color red "Error occurred while running command
\"${command[*]}\" (exit status: ${command_exit_status})!" >&2
local -r read_prompt="Read command output (Y/n)?"
- printf "%s" "${read_prompt}"
+ printf '%s' "${read_prompt}"
local answer='y'
while true; do
read -r answer
- if [ "${answer}" == "y" ] || [ "${answer}" == "Y" ];
then
+ if [ "${answer}" == 'y' ] || [ "${answer}" == 'Y' ];
then
echo "${command_output}"
break
- elif [ "${answer}" == "n" ] || [ "${answer}" == "N" ];
then
+ elif [ "${answer}" == 'n' ] || [ "${answer}" == 'N' ];
then
break
else
- printf "%s" "${read_prompt}"
+ printf '%s' "${read_prompt}"
fi
done
- echo_with_color red "Press ENTER to continue" >&2
+ echo_with_color red 'Press ENTER to continue' >&2
read -r # catch enter key
fi
@@ -1908,7 +1908,7 @@
switch_terminal_text_color red
fi
printf --\
- "Fatal: %s: Parameter quantity illegal, please report
bug.\\n"\
+ 'Fatal: %s: Parameter quantity illegal, please report
bug.\n'\
"${FUNCNAME[0]}"
if [ "${no_color}" == 0 ]; then
switch_terminal_text_color none
@@ -1944,7 +1944,7 @@
fi
# Unset the 1st element
- unset "array_ref[0]"
+ unset 'array_ref[0]'
# Repack array if element still available in array
if [ "${#array_ref[@]}" -ne 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/WoeUSB-3.1.4/src/woeusbgui.1
new/WoeUSB-3.1.5/src/woeusbgui.1
--- old/WoeUSB-3.1.4/src/woeusbgui.1 2017-11-12 07:43:44.000000000 +0100
+++ new/WoeUSB-3.1.5/src/woeusbgui.1 2018-03-19 22:28:23.000000000 +0100
@@ -10,7 +10,7 @@
.B --device
creation method.
.PP
-It is advised to use woeusb(1) instead, as it is more will-maintained and
support more creation methods.
+It is advised to use woeusb(1) instead, as it is more well-maintained and
support more creation methods.
.SH OPTIONS
There are no command line options yet.
