Changeset 1999
- Timestamp:
- Jun 23, 2016, 1:59:19 PM (5 years ago)
- 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
r1982 r1999 10 10 own_window yes 11 11 own_window_class Conky 12 own_window_type d esktop12 own_window_type dock 13 13 #own_window_transparent yes 14 14 #own_window_colour grey … … 136 136 template8 MIRROR \1:${exec cat /tmp/mirror_version.txt | grep 'VERSION \1' | cut -d ":" -f2 | xargs} 137 137 template9 MIRROR DUAL:${exec cat /tmp/mirror_version.txt | grep 'VERSION 32' | cut -d ":" -f2 | xargs} default_color white 138 template0 ${font AvantGardeLTMedium:bold:size=10}${color dodgerblue3}\1 ${hr 2}$ color${font}${voffset 1}138 template0 ${font AvantGardeLTMedium:bold:size=10}${color dodgerblue3}\1 ${hr 2}${color white}${font}${voffset 1} 139 139 TEXT 140 $ color${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font$color${font AvantGardeLTMedium:size=15}141 $alignc${time %a}, ${time %d %b %Y}$font$ color140 ${color white}${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font${color white}${font AvantGardeLTMedium:size=15} 141 $alignc${time %a}, ${time %d %b %Y}$font${color white} 142 142 143 143 ${template0 DATOS} … … 146 146 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}Escritorio${endif}${endif} 147 147 ARQUITECTURA: ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif} 148 VERSIÓN: ${exec lliurex-version | awk -F ',''{print $3}'}148 VERSIÓN:${exec lliurex-version | awk -F ',' '{print $3}'} 149 149 ${template0 SISTEMA} 150 150 Kernel $alignr $kernel … … 154 154 $cpu % ${cpubar} 155 155 ${template0 RAM} 156 Uso de RAM: $mem/$memmax 157 $memperc% $membar 158 Uso de SWAP:$swap/$swapmax 159 $swapperc% ${swapbar} 160 ${template7 eth0 ETH0}${template7 wlan0 WLAN0} 161 ${template7 eth1 ETH1}${template7 wlan0+1 WLAN0+1} 156 Uso de RAM: $memperc% $alignr $memmax 157 Uso de SWAP: $swapperc% $alignr $swapmax 158 ${template7 eth0 ETH0} 159 ${template7 eth1 ETH1} 162 160 ${template0 Disco Duro} 163 161 ${if_mounted /}${template1 /}${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif}$endif -
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_admins_base
r1976 r1999 10 10 own_window yes 11 11 own_window_class Conky 12 own_window_type d esktop12 own_window_type dock 13 13 #own_window_transparent yes 14 14 #own_window_colour grey -
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui
r1982 r1999 11 11 CONKYRC_USED=$FILE_PATH/conkyrc_used 12 12 13 TEXT_COLOUR="white" 13 14 SELECTION_COLOUR2="dodgerblue3" 15 SELECTION_COLOUR="white" 16 SELECTION_COLOUR_DEFECT="white" 17 SELECTION_COLOUR2_DEFECT="dodgerblue3" 14 18 READED=TRUE 15 19 … … 355 359 else 356 360 if [[ $SOY = "CLIENTE" ]]; then 357 SELECTION_COLOUR=" white"361 SELECTION_COLOUR="$SELECTION_COLOUR_DEFECT" 358 362 else 359 SELECTION_COLOUR2=" dodgerblue3"360 SELECTION_COLOUR=" white"363 SELECTION_COLOUR2="$SELECTION_COLOUR2_DEFECT" 364 SELECTION_COLOUR="$SELECTION_COLOUR_DEFECT" 361 365 fi 362 366 … … 383 387 ##DETERMINAMOS LOS COLORES DE LAS FUENTES 384 388 echo ' default_color '$SELECTION_COLOUR' ' >> $CONKYRC_USED 385 echo 'template0 ${font AvantGardeLTMedium:bold:size=10}${color '$SELECTION_COLOUR2'}\1 ${hr 2}$ color${font}${voffset 1}' >> $CONKYRC_USED389 echo 'template0 ${font AvantGardeLTMedium:bold:size=10}${color '$SELECTION_COLOUR2'}\1 ${hr 2}${color '$SELECTION_COLOUR'}${font}${voffset 1}' >> $CONKYRC_USED 386 390 387 391 #FONDO TRANSPARENTE O NO … … 390 394 ##COMIENZA LA CONFIGURACION 391 395 echo "TEXT" >> $CONKYRC_USED 392 if [[ $SELECTION == *HORA* ]] ; then echo '$ color${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font$color${font AvantGardeLTMedium:size=15}' >> $CONKYRC_USED;fi393 if [[ $SELECTION == *DIA* ]] ; then echo '$alignc${time %a}, ${time %d %b %Y}$font$ color' >> $CONKYRC_USED; echo '' >> $CONKYRC_USED; fi396 if [[ $SELECTION == *HORA* ]] ; then echo '${color '$SELECTION_COLOUR'}${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font${color '$SELECTION_COLOUR'}${font AvantGardeLTMedium:size=15}' >> $CONKYRC_USED;fi 397 if [[ $SELECTION == *DIA* ]] ; then echo '$alignc${time %a}, ${time %d %b %Y}$font${color '$SELECTION_COLOUR'}' >> $CONKYRC_USED; echo '' >> $CONKYRC_USED; fi 394 398 395 399 ####DATOS INICIALES#### … … 425 429 if [[ $SELECTION == *IP_ADDRESS* ]] && [[ $SELECTION == *NET_DOWNLOAD* ]] && [[ $SELECTION == *NET_UPLOAD* ]] ; then 426 430 index=0 427 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );431 for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' ); 428 432 do 429 433 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 430 echo '${template3 '$i' '$NET_TITLE'}${template 3wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;431 index=$ index+1434 echo '${template3 '$i' '$NET_TITLE'}${template4 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 435 index=$((index+1)) 432 436 done 433 437 434 438 elif [[ $SELECTION == *NET_DOWNLOAD* ]] ; then 435 439 index=0 436 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );440 for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' ); 437 441 do 438 442 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 439 443 echo '${template5 '$i' '$NET_TITLE'}${template5 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 440 index=$ index+1444 index=$((index+1)) 441 445 done 442 446 443 447 elif [[ $SELECTION == *NET_UPLOAD* ]] ; then 444 448 index=0 445 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );449 for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' ); 446 450 do 447 451 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 448 452 echo '${template6 '$i' '$NET_TITLE'}${template6 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 449 index=$ index+1453 index=$((index+1)) 450 454 done 451 455 elif [[ $SELECTION == *IP_ADDRESS* ]] ; then 452 456 index=0 453 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );457 for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' ); 454 458 do 455 459 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 456 echo '${template7 '$i' '$NET_TITLE'} ${template7 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;457 index=$ index+1460 echo '${template7 '$i' '$NET_TITLE'}' >> $CONKYRC_USED; 461 index=$((index+1)) 458 462 done 459 463 fi … … 490 494 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 491 495 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': ${exec lliurex-version | awk -F '\',\'' '\'{print \$3}\''}' >> $CONKYRC_USED;fi496 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 493 497 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 494 498 echo '$hr' >> $CONKYRC_USED
Note: See TracChangeset
for help on using the changeset viewer.