diff options
| -rwxr-xr-x | bin/live-snapshot | 12 | ||||
| -rwxr-xr-x | scripts/live | 14 | ||||
| -rwxr-xr-x | scripts/live-bottom/10adduser | 2 | ||||
| -rw-r--r-- | scripts/live-helpers | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/bin/live-snapshot b/bin/live-snapshot index 17349fc..989fd3a 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -25,7 +25,7 @@ # On Debian systems, the complete text of the GNU General Public License # can be found in /usr/share/common-licenses/GPL-2 file. -PROGRAM="`basename $0`" +PROGRAM="$(basename $0)" VERSION=0.0.1 # Source live conf @@ -150,8 +150,8 @@ Do_snapshot () ;; ext2|ext3) - DU_DIM="`du -ks ${COW} | cut -f1`" - REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here... + DU_DIM="$(du -ks ${COW} | cut -f1)" + REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here... genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root="${COW}" "${DEST}" || exit 1 ;; @@ -164,8 +164,8 @@ Do_snapshot () Is_same_mount () { - dir1="`Base_path $1`" - dir2="`Base_path $2`" + dir1="$(Base_path $1)" + dir2="$(Base_path $2)" if [ "${dir1}" = "${dir2}" ] then @@ -179,7 +179,7 @@ Parse_args () { # Parse command line ARGS="$1" - ARGUMENTS="`getopt --longoptions cow:,device:,output,resync-string:,type:,help,usage,version --name=${PROGRAM} --options c:d:o:t:r:,h,u,v --shell sh -- ${ARGS}`" + ARGUMENTS="$(getopt --longoptions cow:,device:,output,resync-string:,type:,help,usage,version --name=${PROGRAM} --options c:d:o:t:r:,h,u,v --shell sh -- ${ARGS})" if [ "$?" != "0" ] then diff --git a/scripts/live b/scripts/live index b883c92..47b4469 100755 --- a/scripts/live +++ b/scripts/live @@ -36,7 +36,7 @@ Arguments () { PRESEEDS="" - for ARGUMENT in `cat /proc/cmdline` + for ARGUMENT in $(cat /proc/cmdline) do case "${ARGUMENT}" in access=*) @@ -419,7 +419,7 @@ is_live_path () then for FILESYSTEM in squashfs ext2 ext3 xfs dir do - if [ "`echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}`" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ] + if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ] then return 0 fi @@ -631,7 +631,7 @@ do_netmount () do_httpmount () { rc=1 - extension=`echo "${FETCH}" | sed 's/\(.*\)\.\(.*\)/\2/'` + extension=$(echo "${FETCH}" | sed 's/\(.*\)\.\(.*\)/\2/') case "${extension}" in squashfs|tgz|tar) @@ -838,7 +838,7 @@ setup_unionfs () # Let's just mount the read-only file systems first rofsstring="" rofslist="" - minor_kernel_version=`uname -r|cut -c 5-|sed 's/[^0-9].*//'` + minor_kernel_version=$(uname -r|cut -c 5-|sed 's/[^0-9].*//') if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ] then @@ -851,13 +851,13 @@ setup_unionfs () # Read image names from ${MODULE}.module if it exists if [ -e "${image_directory}/filesystem.${MODULE}.module" ] then - for IMAGE in `cat ${image_directory}/filesystem.${MODULE}.module` + for IMAGE in $(cat ${image_directory}/filesystem.${MODULE}.module) do image_string="${image_string} ${image_directory}/${image}" done elif [ -e "${image_directory}/${MODULE}.module" ] then - for IMAGE in `cat ${image_directory}/${MODULE}.module` + for IMAGE in $(cat ${image_directory}/${MODULE}.module) do image_string="${image_string} ${image_directory}/${image}" done @@ -875,7 +875,7 @@ setup_unionfs () done # Now sort the list - image_string="`echo ${image_string} | sed -e 's/ /\n/g' | sort `" + image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )" fi [ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})" diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser index 4c83fa3..ed2e14e 100755 --- a/scripts/live-bottom/10adduser +++ b/scripts/live-bottom/10adduser @@ -33,7 +33,7 @@ log_begin_msg "Adding live session user..." if [ "${BUILD_SYSTEM}" = "Debian" ] then - user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s` + user_crypted="8Ab05sVQ4LLps" # as in $(echo "live" | mkpasswd -s) else user_crypted="U6aMy0wojraho" # "ubuntu" fi diff --git a/scripts/live-helpers b/scripts/live-helpers index 9cf3b99..f4dae34 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -89,11 +89,11 @@ base_path () do if echo "${mounts}" | grep -qs "^${testpath}" then - set -- `echo "${mounts}" | grep "^${testpath}" | lastline` + set -- $(echo "${mounts}" | grep "^${testpath}" | lastline) echo ${1} break else - testpath=`dirname $testpath` + testpath=$(dirname $testpath) fi done } |