summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2011-10-03 22:06:59 +0200
committerFlorian Pritz <bluewind@xinu.at>2011-10-03 22:06:59 +0200
commit72bfb1db4b6edbcb2711fa68c158cbc88ced6db6 (patch)
tree84fa2f601f4ef2d4721c09f1567d18b45a8c1a86
parent553e0675788308742b83ebaafbf157fecb5271dc (diff)
downloadbin-72bfb1db4b6edbcb2711fa68c158cbc88ced6db6.tar.gz
bin-72bfb1db4b6edbcb2711fa68c158cbc88ced6db6.tar.xz
misc changes
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--ps_mem.py8
m---------remotes/falconindy-bin0
-rwxr-xr-xset-background.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/ps_mem.py b/ps_mem.py
index a789e73..7692c01 100644
--- a/ps_mem.py
+++ b/ps_mem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Try to determine how much RAM is currently being used per program.
# Note per _program_, not per process. So for example this script
@@ -115,10 +115,10 @@ our_pid=os.getpid()
#(major,minor,release)
def kernel_ver():
- kv=open(proc+"sys/kernel/osrelease", "rt").readline().split(".")[:3]
+ kv=open(proc+"sys/kernel/osrelease", "rt").readline().split(".")[:2]
for char in "-_":
- kv[2]=kv[2].split(char)[0]
- return (int(kv[0]), int(kv[1]), int(kv[2]))
+ kv[1]=kv[1].split(char)[0]
+ return (int(kv[0]), int(kv[1]))
try:
kv=kernel_ver()
diff --git a/remotes/falconindy-bin b/remotes/falconindy-bin
-Subproject e8392121a3cdc3a9461166e840e2b6b6a4690a6
+Subproject 92d8ab28192919ea3d3fd60e3be595f06f7a1e0
diff --git a/set-background.sh b/set-background.sh
index e465e7e..8d72476 100755
--- a/set-background.sh
+++ b/set-background.sh
@@ -26,7 +26,7 @@ cd "$(dirname "$1")"
FILE="$(pwd)/$(basename "$1")"
if [ -f "$FILE" ]; then
- echo "feh --bg-center '${FILE}'" > "$HOME/.fehbg";
+ echo "feh --bg-tile '${FILE}'" > "$HOME/.fehbg";
#rm "$HOME/backgrounds/current_bg";
#ln -sf "${FILE}" "$HOME/backgrounds/current_bg";
source $HOME/.fehbg