Changeset 1892
- Timestamp:
- Jun 9, 2016, 2:45:59 PM (5 years ago)
- Location:
- lliurex-conky/trunk/fuentes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-conky/trunk/fuentes/debian/changelog
r1880 r1892 1 lliurex-conky (0.62) xenial; urgency=high 2 3 * Adding new propierties to conky server 4 5 -- Daniel Duran Vecino <daduve@gmail.com> Thu, 09 Jun 2016 14:45:16 +0200 6 1 7 lliurex-conky (0.61) xenial; urgency=high 2 8 -
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_admins
r1598 r1892 2 2 # conkyrc_admins 3 3 # 4 # author : Daniel Dur án4 # author : Daniel Duran 5 5 # version : xenial 6 6 # license : Distributed under the terms of GNU GPL version 2 or later … … 11 11 own_window_class Conky 12 12 own_window_type desktop 13 own_window_transparent yes13 #own_window_transparent yes 14 14 #own_window_colour grey 15 15 own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager 16 16 own_window_title LLIUREX_CONKY 17 #own_window_argb_visual yes18 #own_window_argb_value 24017 own_window_argb_visual yes 18 own_window_argb_value 150 19 19 20 20 … … 30 30 alignment top_right 31 31 gap_x 10 32 gap_y 1 3032 gap_y 170 33 33 34 34 cpu_avg_samples 5 … … 45 45 46 46 # Alpha of Xft font. Must be a value at or between 1 and 0 ### 47 xftalpha 0. 847 xftalpha 0.6 48 48 # Force UTF8? requires XFT ### 49 49 override_utf8_locale yes … … 53 53 54 54 draw_outline no #### <<<<<<---------------- Amplifies text if yes 55 #default_outline_color black 56 default_outline_color 00FFFF 55 default_outline_color black 57 56 58 57 uppercase no … … 74 73 #color9 FF0000 #255 0 0 Red 75 74 76 default_color 00ffff77 78 75 ##################################################### End Color Settings ### 79 76 ### Borders Section ######################################################## … … 92 89 93 90 # Boolean value, if true, Conky will be forked to background when started. 94 background no91 background yes 95 92 96 93 # Adds spaces around certain objects to stop them from moving other things … … 122 119 ############################################## End Miscellaneous Section 123 120 124 default_color 00ffff 125 xftfont De jaVu Sans Mono:size=10121 122 xftfont Debian bold:size=10 126 123 ################### 127 124 #### TEMPLATES ###### 128 125 ################### 129 126 130 template0 ${font AvantGardeLTMedium:bold:size=10}${color FF8C00}\1 ${hr 2}$color${font}${voffset 1} 127 128 131 129 template1 USED \1: ${fs_used_perc \1}% ${alignr\ 80}${fs_bar\ \1} 132 130 template2 ${\1 name \2}${alignr}${\1 \3 \2} % 133 131 template3 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}\nDLS:${downspeed \1} kb/s\nULS:${upspeed \1} kb/s$endif 134 132 template4 ${if_up \1}${template0 \2}\ndown $alignr ${downspeed \1}/s\nup $alignr ${upspeed \1}/s\ntotal down$alignr${totaldown \1}\ntotal up $alignr${totalup \1}$endif 135 template5 MIRROR \1:${exec cat /tmp/mirror_version.txt | grep 'VERSION \1' | cut -d ":" -f2 | xargs} 136 template6 MIRROR DUAL:${exec cat /tmp/mirror_version.txt | grep 'VERSION 32' | cut -d ":" -f2 | xargs} 133 template5 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}\nDLS:${downspeed \1} kb/s$endif 134 template6 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}\nULS:${upspeed \1} kb/s$endif 135 template7 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}$endif 136 template8 MIRROR \1:${exec cat /tmp/mirror_version.txt | grep 'VERSION \1' | cut -d ":" -f2 | xargs} 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} 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$color 137 142 138 139 TEXT140 143 ${template0 DATOS} 141 144 USUARIO: $LOGNAME 142 145 EQUIPO: $nodename 143 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}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} 144 147 ARQUITECTURA: ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif} 145 VERSION: ${exec /usr/bin/lliurex-version -n} 146 ${if_existing /tmp/mirror_version.txt}${if_match ${exec grep "VERSION 32" /tmp/mirror_version.txt -c}!=0}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template6}${else}${template5 32}${endif}${else}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template5 64}${endif}${endif}${endif} 147 ${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif} 148 # SYS 149 ${template0 SYSTEM} 148 VERSIÓN: ${if_existing /usr/share/lliurex-cdd/version}${exec cat /usr/share/lliurex-cdd/version}${endif} 149 ${template0 SISTEMA} 150 150 Kernel $alignr $kernel 151 Uptime $alignr $uptime 152 153 # CPU 151 T. encendido $alignr $uptime 154 152 ${template0 CPU} 155 153 ${exec cat /proc/cpuinfo | grep 'model name' | cut -c 14-42 | uniq } 156 154 $cpu % ${cpubar} 157 ${cpugraph}158 # RAM159 155 ${template0 RAM} 160 RAM Usage: $mem/$memmax156 Uso de RAM: $mem/$memmax 161 157 $memperc% $membar 162 SWAP Usage:$swap/$swapmax158 Uso de SWAP:$swap/$swapmax 163 159 $swapperc% ${swapbar} 164 165 # NETWORK 166 #IP: ${addrs eth0} 167 ${template3 eth0 ETH0}${template3 wlan0 WLAN0} 168 ${template3 eth1 ETH1}${template3 wlan1 WLAN1} 169 ${template3 eth2 ETH2}${template3 wlan2 WLAN2} 170 # HDD 171 ${template0 HDD} 172 ${template1 /} 173 ${if_mounted /net${template1 /net}}${if_match ${fs_used_perc /net}>=95}${execi 100 /usr/share/lliurex-conky/hdd_full_net}${else}${endif}$endif 160 ${template7 eth0 ETH0}${template7 wlan0 WLAN0} 161 ${template7 eth1 ETH1}${template7 wlan0+1 WLAN0+1} 162 ${template0 Disco Duro} 163 ${if_mounted /}${template1 /}${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif}$endif 164 ${if_mounted /net}${template1 /net}${if_match ${fs_used_perc /net}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full_net}${else}${endif}$endif -
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_admins_base
r1598 r1892 2 2 # conkyrc_admins 3 3 # 4 # author : Daniel Dur án4 # author : Daniel Duran 5 5 # version : xenial 6 6 # license : Distributed under the terms of GNU GPL version 2 or later … … 11 11 own_window_class Conky 12 12 own_window_type desktop 13 own_window_transparent yes13 #own_window_transparent yes 14 14 #own_window_colour grey 15 15 own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager 16 16 own_window_title LLIUREX_CONKY 17 #own_window_argb_visual yes18 #own_window_argb_value 24017 own_window_argb_visual yes 18 own_window_argb_value 150 19 19 20 20 … … 30 30 alignment top_right 31 31 gap_x 10 32 gap_y 1 3032 gap_y 170 33 33 34 34 cpu_avg_samples 5 … … 45 45 46 46 # Alpha of Xft font. Must be a value at or between 1 and 0 ### 47 xftalpha 0. 847 xftalpha 0.6 48 48 # Force UTF8? requires XFT ### 49 49 override_utf8_locale yes … … 89 89 90 90 # Boolean value, if true, Conky will be forked to background when started. 91 background no91 background yes 92 92 93 93 # Adds spaces around certain objects to stop them from moving other things … … 120 120 121 121 122 xftfont De jaVu Sans Mono:size=10122 xftfont Debian bold:size=10 123 123 ################### 124 124 #### TEMPLATES ###### 125 125 ################### 126 126 127 127 128 … … 130 131 template3 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}\nDLS:${downspeed \1} kb/s\nULS:${upspeed \1} kb/s$endif 131 132 template4 ${if_up \1}${template0 \2}\ndown $alignr ${downspeed \1}/s\nup $alignr ${upspeed \1}/s\ntotal down$alignr${totaldown \1}\ntotal up $alignr${totalup \1}$endif 132 template5 MIRROR \1:${exec cat /tmp/mirror_version.txt | grep 'VERSION \1' | cut -d ":" -f2 | xargs} 133 template6 MIRROR DUAL:${exec cat /tmp/mirror_version.txt | grep 'VERSION 32' | cut -d ":" -f2 | xargs} 134 133 template5 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}\nDLS:${downspeed \1} kb/s$endif 134 template6 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}\nULS:${upspeed \1} kb/s$endif 135 template7 ${if_up \1}${template0 \2}\nIP ${alignr 9} ${addrs \1}$endif 136 template8 MIRROR \1:${exec cat /tmp/mirror_version.txt | grep 'VERSION \1' | cut -d ":" -f2 | xargs} 137 template9 MIRROR DUAL:${exec cat /tmp/mirror_version.txt | grep 'VERSION 32' | cut -d ":" -f2 | xargs} -
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui
r1633 r1892 11 11 CONKYRC_USED=$FILE_PATH/conkyrc_used 12 12 13 TEXT_COLOUR=" black"13 TEXT_COLOUR="white" 14 14 READED=TRUE 15 15 … … 87 87 MSG_SEMILIGERO_PANEL=$(gettext "Semithin") 88 88 MSG_DESKTOP_PANEL=$(gettext "Desktop") 89 89 MSG_COLOUR_QUESTION=$(gettext "Do you want to change colour fonts or use default mode?") 90 MSG_BOTON_COLOR_OK=$(gettext "DEFAULT") 91 MSG_BOTON_COLOR_CANCEL=$(gettext "CHANGE") 92 MSG_TIME=$(gettext "TIME") 93 MSG_TIME_DESC=$(gettext "You can show the time with this clock in the desktop") 94 MSG_DATE=$(gettext "DATE") 95 MSG_DATE_DESC=$(gettext "You can show the date in your desktop") 96 MSG_SHADE=$(gettext "TRANSPARENT") 97 MSG_SHADE_DESC=$(gettext "You eliminate the shadow in Conky desktop") 90 98 91 99 … … 228 236 SELECTION=`zenity --title "$MSG_TITLE" --list --width 850 --height=620 --text "$MSG_TITPARAM" --checklist --column "$MSG_SELECCIONA" --hide-column=2 --column "SELECCIONA" --column "$MSG_PARAMETRO" --column "$MSG_DESCRIPCION" \ 229 237 $READED "USUARIO" "$MSG_USER" "$MSG_USER_DESC" \ 238 TRUE "HORA" "$MSG_TIME" "$MSG_TIME_DESC" \ 239 TRUE "DIA" "$MSG_DATE" "$MSG_DATE_DESC" \ 230 240 TRUE "EQUIPO" "$MSG_HOSTNAME" "$MSG_HOSTNAME_DESC" \ 231 241 TRUE "CLIENTE" "$MSG_CLIENT" "$MSG_CLIENT_TYPE" \ … … 238 248 TRUE "CPU_TYPE" "$MSG_CPU_TYPE" "$MSG_CPU_TYPE" \ 239 249 TRUE "CPU_BAR" "$MSG_CPU_BAR" "$MSG_CPU_BAR_DESC" \ 240 TRUE "CPU_GRAPH" "$MSG_CPU_GRAPH" "$MSG_CPU_GRAPH_DESC" \250 FALSE "CPU_GRAPH" "$MSG_CPU_GRAPH" "$MSG_CPU_GRAPH_DESC" \ 241 251 TRUE "RAM_USAGE" "$MSG_RAM_USAGE" "$MSG_RAM_USAGE_DESC" \ 242 TRUE "RAM_BAR" "$MSG_RAM_BAR" "$MSG_RAM_BAR_DESC" \252 FALSE "RAM_BAR" "$MSG_RAM_BAR" "$MSG_RAM_BAR_DESC" \ 243 253 TRUE "SWAP_USAGE" "$MSG_SWAP_USAGE" "$MSG_SWAP_USAGE_DESC" \ 244 TRUE "SWAP_BAR" "$MSG_SWAP_BAR" "$MSG_SWAP_BAR_DESC" \254 FALSE "SWAP_BAR" "$MSG_SWAP_BAR" "$MSG_SWAP_BAR_DESC" \ 245 255 TRUE "IP_ADDRESS" "$MSG_NET_ADDRESS" "$MSG_NET_ADDRESS_DESC" \ 246 TRUE "NET_DOWNLOAD" "$MSG_NET_DOWNLOAD" "$MSG_NET_DOWNLOAD_DESC" \247 TRUE "NET_UPLOAD" "$MSG_NET_UPLOAD" "$MSG_NET_UPLOAD_DESC" \256 FALSE "NET_DOWNLOAD" "$MSG_NET_DOWNLOAD" "$MSG_NET_DOWNLOAD_DESC" \ 257 FALSE "NET_UPLOAD" "$MSG_NET_UPLOAD" "$MSG_NET_UPLOAD_DESC" \ 248 258 TRUE "HDD_USED" "$MSG_HDD_USED" "$MSG_HDD_USED_DESC" \ 259 FALSE "SHADE" "$MSG_SHADE" "$MSG_SHADE_DESC" \ 249 260 --separator=":"` 250 261 cancelar $? … … 335 346 336 347 function change_colour { 337 zenity --title "$MSG_TITLE" --question --text " Do you want to change colour fonts or use default mode?" --ok-label=CHANGE --cancel-label=DEFAULT338 if [[ $? = 0 ]]; then348 zenity --title "$MSG_TITLE" --question --text "$MSG_COLOUR_QUESTION" --ok-label=$MSG_BOTON_COLOR_OK --cancel-label=$MSG_BOTON_COLOR_CANCEL 349 if [[ $? != 0 ]]; then 339 350 if [[ $SOY = "CLIENTE" ]]; then 340 351 text_colour_client … … 346 357 SELECTION_COLOUR="white" 347 358 else 348 SELECTION_COLOUR2=" FF8C00"349 SELECTION_COLOUR=" black"359 SELECTION_COLOUR2="dodgerblue3" 360 SELECTION_COLOUR="white" 350 361 fi 351 362 … … 369 380 #echo "">>$CONKYRC_USED 370 381 382 371 383 ##DETERMINAMOS LOS COLORES DE LAS FUENTES 372 384 echo ' default_color '$SELECTION_COLOUR' ' >> $CONKYRC_USED 373 385 echo 'template0 ${font AvantGardeLTMedium:bold:size=10}${color '$SELECTION_COLOUR2'}\1 ${hr 2}$color${font}${voffset 1}' >> $CONKYRC_USED 374 386 387 #FONDO TRANSPARENTE O NO 388 if [[ $SELECTION == *SHADE* ]] ; then echo 'own_window_transparent yes' >> $CONKYRC_USED; echo '' >> $CONKYRC_USED; fi 389 375 390 ##COMIENZA LA CONFIGURACION 376 391 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;fi 393 if [[ $SELECTION == *DIA* ]] ; then echo '$alignc${time %a}, ${time %d %b %Y}$font$color' >> $CONKYRC_USED; echo '' >> $CONKYRC_USED; fi 377 394 378 395 ####DATOS INICIALES#### … … 383 400 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 384 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 385 if [[ $SELECTION == *MIRROR_VERSION* ]] ; then echo '${if_existing /tmp/mirror_version.txt}${if_match ${exec grep "VERSION 32" /tmp/mirror_version.txt -c}!=0}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template6}${else}${template5 32}${endif}${else}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template5 64}${endif}${endif}${endif}' >> $CONKYRC_USED;fi 386 if [[ $SELECTION == *HDD_ALERT* ]] ; then echo '${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif}' >> $CONKYRC_USED;fi 402 if [[ $SELECTION == *MIRROR_VERSION* ]] ; then 403 if ( rgrep 32 /tmp/mirror.txt ) || ( rgrep 64 /tmp/mirror.txt) ; then 404 echo '${if_existing /tmp/mirror_version.txt}${if_match ${exec grep "VERSION 32" /tmp/mirror_version.txt -c}!=0}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template9}${else}${template8 32}${endif}${else}${if_match ${exec grep "VERSION 64" /tmp/mirror_version.txt -c}!=0}${template8 64}${endif}${endif}${endif}' >> $CONKYRC_USED 405 fi 406 fi 387 407 ####SYSTEMA#### 388 if [[ $SELECTION == *HDD_ALERT* ]] ; then echo "No blank added";else echo "">> $CONKYRC_USED;fi389 408 if [[ $SELECTION == *KERNEL* ]] || [[ $SELECTION == *UPTIME* ]] ; then echo '${template0 '$MSG_SYSTEM_PANEL'}' >> $CONKYRC_USED;fi 390 409 if [[ $SELECTION == *KERNEL* ]] ; then echo 'Kernel $alignr $kernel' >> $CONKYRC_USED;fi 391 410 if [[ $SELECTION == *UPTIME* ]] ; then echo ''$MSG_UPTIME_PANEL' $alignr $uptime' >> $CONKYRC_USED;fi 392 411 ####CPU#### 393 if [[ $SELECTION == *CPU* ]] ; then echo "">> $CONKYRC_USED; echo'${template0 CPU}' >> $CONKYRC_USED;fi412 if [[ $SELECTION == *CPU* ]] ; then echo '${template0 CPU}' >> $CONKYRC_USED;fi 394 413 if [[ $SELECTION == *CPU_TYPE* ]] ; then echo "\${exec cat /proc/cpuinfo | grep 'model name' | cut -c 14-42 | uniq }" >> $CONKYRC_USED;fi 395 414 if [[ $SELECTION == *CPU_BAR* ]] ; then echo '$cpu % ${cpubar}' >> $CONKYRC_USED;fi 396 415 if [[ $SELECTION == *CPU_GRAPH* ]] ; then 397 416 echo '${cpugraph}' >> $CONKYRC_USED; 398 else399 echo "">> $CONKYRC_USED400 417 fi 401 418 ####RAM#### 402 419 if [[ $SELECTION == *RAM* ]] || [[ $SELECTION == *SWAP* ]] ; then echo '${template0 RAM}' >> $CONKYRC_USED;fi 403 if [[ $SELECTION == *RAM_USAGE* ]] ; then echo ''$MSG_RAM_USAGE_PANEL': $mem /$memmax' >> $CONKYRC_USED;fi404 if [[ $SELECTION == *RAM_BAR* ]] ; then echo '$mem perc% $membar' >> $CONKYRC_USED;fi405 if [[ $SELECTION == *SWAP_USAGE* ]] ; then echo ''$MSG_SWAP_USAGE_PANEL': $swap/$swapmax' >> $CONKYRC_USED;fi406 if [[ $SELECTION == *SWAP_BAR* ]] ; then echo '$ swapperc% ${swapbar}' >> $CONKYRC_USED;fi420 if [[ $SELECTION == *RAM_USAGE* ]] ; then echo ''$MSG_RAM_USAGE_PANEL': $memperc% $alignr $memmax' >> $CONKYRC_USED;fi 421 if [[ $SELECTION == *RAM_BAR* ]] ; then echo '$membar' >> $CONKYRC_USED;fi 422 if [[ $SELECTION == *SWAP_USAGE* ]] ; then echo ''$MSG_SWAP_USAGE_PANEL': $swapperc% $alignr $swapmax' >> $CONKYRC_USED;fi 423 if [[ $SELECTION == *SWAP_BAR* ]] ; then echo '${swapbar}' >> $CONKYRC_USED;fi 407 424 ####NETWORK#### 408 if [[ $SELECTION == *IP_ADDRESS* ]] && [[ $SELECTION == *NET_DOWNLOAD* ]] && [[ $SELECTION == *NET_UPLOAD* ]] ; then echo '${template3 eth0 ETH0}${template3 wlan0 WLAN0}' >> $CONKYRC_USED; echo '${template3 eth1 ETH1}${template3 wlan1 WLAN1}' >> $CONKYRC_USED; echo '${template3 eth2 ETH2}${template3 wlan2 WLAN2}' >> $CONKYRC_USED; 409 elif [[ $SELECTION == *NET_DOWNLOAD* ]] ; then echo '${template5 eth0 ETH0}${template5 wlan0 WLAN0}' >> $CONKYRC_USED; echo '${template5 eth1 ETH1}${template5 wlan1 WLAN1}' >> $CONKYRC_USED; echo '${template5 eth2 ETH2}${template5 wlan2 WLAN2}' >> $CONKYRC_USED; 410 elif [[ $SELECTION == *NET_UPLOAD* ]] ; then echo '${template6 eth0 ETH0}${template6 wlan0 WLAN0}' >> $CONKYRC_USED; echo '${template6 eth1 ETH1}${template6 wlan1 WLAN1}' >> $CONKYRC_USED; echo '${template6 eth2 ETH2}${template6 wlan2 WLAN2}' >> $CONKYRC_USED; 411 elif [[ $SELECTION == *IP_ADDRESS* ]] ; then echo '${template7 eth0 ETH0}${template7 wlan0 WLAN0}' >> $CONKYRC_USED; echo '${template7 eth1 ETH1}${template7 wlan1 WLAN1}' >> $CONKYRC_USED; echo '${template7 eth2 ETH2}${template7 wlan2 WLAN2}' >> $CONKYRC_USED; 425 if [[ $SELECTION == *IP_ADDRESS* ]] && [[ $SELECTION == *NET_DOWNLOAD* ]] && [[ $SELECTION == *NET_UPLOAD* ]] ; then 426 index=0 427 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' ); 428 do 429 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 430 echo '${template3 '$i' '$NET_TITLE'}${template3 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 431 index=$index+1 432 done 433 434 elif [[ $SELECTION == *NET_DOWNLOAD* ]] ; then 435 index=0 436 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' ); 437 do 438 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 439 echo '${template5 '$i' '$NET_TITLE'}${template5 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 440 index=$index+1 441 done 442 443 elif [[ $SELECTION == *NET_UPLOAD* ]] ; then 444 index=0 445 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' ); 446 do 447 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 448 echo '${template6 '$i' '$NET_TITLE'}${template6 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 449 index=$index+1 450 done 451 elif [[ $SELECTION == *IP_ADDRESS* ]] ; then 452 index=0 453 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' ); 454 do 455 NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' ) 456 echo '${template7 '$i' '$NET_TITLE'}${template7 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED; 457 index=$index+1 458 done 412 459 fi 413 460 ####HDD#### 414 if [[ $SELECTION == *HDD* ]] ; then echo '${template0 '$MSG_HDD_PANEL'}' >> $CONKYRC_USED;fi 415 if [[ $SELECTION == *CPU_TYPE* ]] ; then echo '${template1 /}' >> $CONKYRC_USED; echo '${if_mounted /net${template1 /net}}$endif' >> $CONKYRC_USED;fi 416 417 #####LINEA QUE ME SIRVE PARA INDICAR QUE FUE MODIFICADO POR EL USUARIO, SE AÑADE AL INICIO DEL FICHERO 461 462 if [[ $SELECTION == *HDD* ]] && [[ $SELECTION == *HDD_ALERT* ]] ; then echo '${template0 '$MSG_HDD_PANEL'}' >> $CONKYRC_USED; echo '${if_mounted /}${template1 /}${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif}$endif' >> $CONKYRC_USED; echo '${if_mounted /net}${template1 /net}${if_match ${fs_used_perc /net}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full_net}${else}${endif}$endif' >> $CONKYRC_USED;fi 463 464 if [[ $SELECTION == *HDD* ]] && [[ $SELECTION != *HDD_ALERT* ]] ; then echo '${template0 '$MSG_HDD_PANEL'}' >> $CONKYRC_USED; echo '${if_mounted /}${template1 /}$endif' >> $CONKYRC_USED; echo '${if_mounted /net}${template1 /net}$endif' >> $CONKYRC_USED; fi 465 466 if [[ $SELECTION != *HDD* ]] && [[ $SELECTION == *HDD_ALERT* ]] ; then echo '${if_mounted /}${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif}$endif' >> $CONKYRC_USED; echo '${if_mounted /net}${if_match ${fs_used_perc /net}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full_net}${else}${endif}$endif' >> $CONKYRC_USED;fi 467 #####LINEA QUE ME SIRVE PARA INDICAR QUE FUE MODIFICADO POR EL USUARIO, SE ANYADE AL INICIO DEL FICHERO 418 468 sed -i '1s/^/#modified_by_user\n/' $CONKYRC_USED 419 469
Note: See TracChangeset
for help on using the changeset viewer.