opengnsys
/
opengnsys
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

#1048: Avoid Awk 5.x warning when escaping quotes.

master
Ramón M. Gómez 2021-07-06 11:55:45 +02:00
parent 87b8c46988
commit 142d1c8a09
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/engine/Boot.lib
View File

@ -1447,7 +1447,7 @@ function ogBootLoaderHidePartitions ()
# /* (comentario de bloque para Doxygen) # /* (comentario de bloque para Doxygen)
# Entradas de Windows: numero de linea y particion. De mayor a menor. # Entradas de Windows: numero de linea y particion. De mayor a menor.
WINENTRY=$(awk '/menuentry.*Windows/ {gsub(/\)\"/, ""); gsub(/^.*dev/,""); print NR":/dev"$1} ' $CFGFILE | sed -e '1!G;h;$!d') WINENTRY=$(awk '/menuentry.*Windows/ {gsub(/\)["'"'"']/, ""); gsub(/^.*dev/,""); print NR":/dev"$1} ' $CFGFILE | sed -e '1!G;h;$!d')
#*/ (comentario para bloque Doxygen) #*/ (comentario para bloque Doxygen)
# Particiones de Windows, pueden no estar en el grub. # Particiones de Windows, pueden no estar en el grub.
WINPART=$(fdisk -l $(ogDiskToDev)|awk '/NTFS/ {print $1}'|sed '1!G;h;$!d') WINPART=$(fdisk -l $(ogDiskToDev)|awk '/NTFS/ {print $1}'|sed '1!G;h;$!d')

6
client/engine/Image.lib
View File

@ -950,9 +950,9 @@ then
if `echo $PARTCLONEINFO | grep size > /dev/null` if `echo $PARTCLONEINFO | grep size > /dev/null`
then then
TOOLS=PARTCLONE TOOLS=PARTCLONE
FS=$(echo $PARTCLONEINFO | awk '{gsub(/\: /,"\n"); print toupper($8);}') FS=$(echo $PARTCLONEINFO | awk '{gsub(/: /,"\n"); print toupper($8);}')
if [[ "$FS" == "HFS" || "$FS" == "HFSPLUS" || "$FS" == "FAT32" ]]; then if [[ "$FS" == "HFS" || "$FS" == "HFSPLUS" || "$FS" == "FAT32" ]]; then
FSPLUS=$(echo $PARTCLONEINFO | awk '{gsub(/\: /,"\n"); print toupper($9);}') FSPLUS=$(echo $PARTCLONEINFO | awk '{gsub(/: /,"\n"); print toupper($9);}')
echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024 echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024
if [ "$FSPLUS" == "PLUS" ]; then if [ "$FSPLUS" == "PLUS" ]; then
FS=$FS$FSPLUS FS=$FS$FSPLUS
@ -962,7 +962,7 @@ then
fi fi
else else
echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024 echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024
SIZE=$(echo $PARTCLONEINFO | awk -v FACTOR=$SIZEFACTOR '{gsub(/\: /,"\n"); printf "%d\n", $11*FACTOR;}') SIZE=$(echo $PARTCLONEINFO | awk -v FACTOR=$SIZEFACTOR '{gsub(/: /,"\n"); printf "%d\n", $11*FACTOR;}')
fi fi
IMGDETECT="TRUE" IMGDETECT="TRUE"
fi fi

4
client/engine/Inventory.lib
View File

@ -408,11 +408,11 @@ MNTDIR=$(ogMount $1 $2) || return $?
# Para GNU/Linux: leer descripción. # Para GNU/Linux: leer descripción.
TYPE="Linux" TYPE="Linux"
FILE="$MNTDIR/etc/os-release" FILE="$MNTDIR/etc/os-release"
[ -r $FILE ] && VERSION="$(awk -F= '$1~/PRETTY_NAME/ {gsub(/\"/,"",$2); print $2}' $FILE)" [ -r $FILE ] && VERSION="$(awk -F= '$1~/PRETTY_NAME/ {gsub(/"/,"",$2); print $2}' $FILE)"
# Si no se puede obtener, buscar en ficheros del sistema. # Si no se puede obtener, buscar en ficheros del sistema.
if [ -z "$VERSION" ]; then if [ -z "$VERSION" ]; then
FILE="$MNTDIR/etc/lsb-release" FILE="$MNTDIR/etc/lsb-release"
[ -r $FILE ] && VERSION="$(awk -F= '$1~/DESCRIPTION/ {gsub(/\"/,"",$2); print $2}' $FILE)" [ -r $FILE ] && VERSION="$(awk -F= '$1~/DESCRIPTION/ {gsub(/"/,"",$2); print $2}' $FILE)"
for DISTRIB in redhat SuSE mandrake gentoo; do for DISTRIB in redhat SuSE mandrake gentoo; do
FILE="$MNTDIR/etc/${DISTRIB}-release" FILE="$MNTDIR/etc/${DISTRIB}-release"
[ -r $FILE ] && VERSION="$(head -1 $FILE)" [ -r $FILE ] && VERSION="$(head -1 $FILE)"