Changeset 1982


Ignore:
Timestamp:
Jun 22, 2016, 4:41:17 PM (5 years ago)
Author:
daduve
Message:

Adding new version

Location:
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_admins

    r1975 r1982  
    146146CLIENTE: ${if_match ${exec grep "server" /tmp/conky-test.txt -c}!=0}${if_empty ${exec echo $DISPLAY | cut -d ":" -f 1}}Servidor${else}Ligero${endif}${else}${if_match ${exec grep "client" /tmp/conky-test.txt -c}!=0}${if_empty ${exec cat /tmp/conky-test-fat.txt | grep true }}Pesado${else}Semiligero${endif}${else}Escritorio${endif}${endif}
    147147ARQUITECTURA: ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif}
    148 VERSIÓN: ${if_existing /usr/share/lliurex-cdd/version}${exec cat /usr/share/lliurex-cdd/version}${endif}
     148VERSIÓN: ${exec lliurex-version | awk -F ','  '{print $3}'}
    149149${template0 SISTEMA}
    150150Kernel $alignr $kernel

  • lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui

    r1892 r1982  
    399399        if [[ $SELECTION == *CLIENTE* ]] ; then echo ''$MSG_CLIENT': ${if_match ${exec grep "server" /tmp/conky-test.txt -c}!=0}${if_empty ${exec echo $DISPLAY | cut -d ":" -f 1}}'$MSG_SERVER_PANEL'${else}'$MSG_LIGERO_PANEL'${endif}${else}${if_match ${exec grep "client" /tmp/conky-test.txt -c}!=0}${if_empty ${exec cat /tmp/conky-test-fat.txt | grep true }}'$MSG_PESADO_PANEL'${else}'$MSG_SEMILIGERO_PANEL'${endif}${else}'$MSG_DESKTOP_PANEL'${endif}${endif}' >> $CONKYRC_USED;fi
    400400        if [[ $SELECTION == *ARQUITECTURA* ]] ; then echo ''$MSG_ARCHITECTURE': ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif}' >> $CONKYRC_USED;fi
    401         if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION': ${if_existing /usr/share/lliurex-cdd/version}${exec cat /usr/share/lliurex-cdd/version}${endif}' >> $CONKYRC_USED;fi
     401        if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION':${exec lliurex-version | awk -F '\',\'' '\'{print \$3}\''}' >> $CONKYRC_USED;fi
    402402        if [[ $SELECTION == *MIRROR_VERSION* ]] ; then
    403403                if  ( rgrep 32 /tmp/mirror.txt ) || ( rgrep 64 /tmp/mirror.txt) ; then
    … …  
    490490        if [[ $SELECTION == *CLIENTE* ]] ; then echo ''$MSG_CLIENT': ${if_match ${exec grep "server" /tmp/conky-test.txt -c}!=0}${if_empty ${exec echo $DISPLAY | cut -d ":" -f 1}}'$MSG_SERVER_PANEL'${else}'$MSG_LIGERO_PANEL'${endif}${else}${if_match ${exec grep "client" /tmp/conky-test.txt -c}!=0}${if_empty ${exec cat /tmp/conky-test-fat.txt | grep true }}'$MSG_PESADO_PANEL'${else}'$MSG_SEMILIGERO_PANEL'${endif}${else}'$MSG_DESKTOP_PANEL'${endif}${endif}' >> $CONKYRC_USED;fi
    491491        if [[ $SELECTION == *ARQUITECTURA* ]] ; then echo ''$MSG_ARCHITECTURE': ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif}' >> $CONKYRC_USED;fi
    492         if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION': ${if_existing /usr/share/lliurex-cdd/version}${exec cat /usr/share/lliurex-cdd/version}${endif}' >> $CONKYRC_USED;fi
     492        if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION':${exec lliurex-version | awk -F '\',\'' '\'{print \$3}\''}' >> $CONKYRC_USED;fi
    493493        if [[ $SELECTION == *IP_ADDRESS* ]] ;  then echo '$hr${template1 eth0 ETH0}${template1 eth1 ETH1}${template1 eth2 ETH2}${template1 eth3 ETH3}${template1 eth4 ETH4}'>> $CONKYRC_USED;fi
    494494        echo '$hr' >> $CONKYRC_USED

  • lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_students

    r57 r1982  
    119119  EQUIPO: $nodename
    120120  CLIENTE:${if_match ${exec grep "server" /tmp/conky-test.txt -c}!=0}${if_empty ${exec echo $DISPLAY | cut -d ":" -f 1}}Servidor${else}Ligero${endif}${else}${if_match ${exec grep "client" /tmp/conky-test.txt -c}!=0}${if_empty ${exec cat /tmp/conky-test-fat.txt | grep true }}Pesado${else}Semiligero${endif}${else}Desktop${endif}${endif}
    121   VERSION: ${if_existing /usr/share/lliurex-cdd/version}${exec cat /usr/share/lliurex-cdd/version}${endif}
     121  VERSION: ${exec lliurex-version | awk -F ','  '{print $3}'}
    122122  ARQUITECTURA: ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif}
    123123$hr${template1 eth0 ETH0}${template1 enp0s8 ETH1}${template1 eth2 ETH2}${template1 eth3 ETH3}${template1 eth4 ETH4}
Note: See TracChangeset for help on using the changeset viewer.