diff options
author | Melik Manukyan <melik@archlinux.us> | 2010-01-17 14:52:16 -0800 |
---|---|---|
committer | Melik Manukyan <melik@archlinux.us> | 2010-01-17 14:52:16 -0800 |
commit | 77deabd4d15e35e3dde02bc7286964d18abd9a4f (patch) | |
tree | bfe9fe983ecdb41b632bbac9455ef57b25f952ac | |
parent | ecd9c11bf52e2d0a2aab25f8d2c095d42f5ce19b (diff) |
cleanup
-rw-r--r-- | archey | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -103,14 +103,13 @@ def output(key, value): # RAM Function def ram_display(): - raminfo = Popen(['free', '-m'], stdout=PIPE).communicate()[0].split('\n') - ram = ''.join(filter(re.compile('M').search, raminfo)).split() - used = int(ram[2]) - int(ram[5]) - int(ram[6]) - output ('RAM', '%s MB / %s MB' % (used, ram[1])) + raminfo = Popen(['free', '-m'], stdout=PIPE).communicate()[0].split('\n') + ram = ''.join(filter(re.compile('M').search, raminfo)).split() + used = int(ram[2]) - int(ram[5]) - int(ram[6]) + output ('RAM', '%s MB / %s MB' % (used, ram[1])) # Screenshot Function screen = '%s' % options.screenshot - def screenshot(): subprocess.check_call(['scrot', '-cd5']) @@ -132,11 +131,11 @@ def hostname_display(): # CPU Function def cpu_display(): - file = open('/proc/cpuinfo').readlines() - cpuinfo = re.sub(' +', ' ', file[4].replace('model name\t: ', '').rstrip('\n')) - output ('CPU', cpuinfo) + file = open('/proc/cpuinfo').readlines() + cpuinfo = re.sub(' +', ' ', file[4].replace('model name\t: ', '').rstrip('\n')) + output ('CPU', cpuinfo) -# Upscrottime Function +# Uptime Function def uptime_display(): fuptime = int(open('/proc/uptime').read().split('.')[0]) day = int(fuptime / 86400) |