Merge branch 'behavior_mods' of git://github.com/noushi/nocache

* 'behavior_mods' of git://github.com/noushi/nocache: added -n option to nocache.global added BASEDIR to nocache.global (modifiable by sed) simplified LD_PRELOAD declaration

Merge branch 'behavior_mods' of git://github.com/noushi/nocache
ff1c52d9 · Julius Plenz · 5ff4aa6b · ca7269e5 · ff1c52d9 · ff1c52d9
Commit ff1c52d9 authored May 02, 2013 by Julius Plenz
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 10 deletions

nocache nocache +5 -4

nocache.global nocache.global +8 -6

No files found.
--- a/nocache
+++ b/nocache
@@ -2,10 +2,11 @@
 NOCACHE_PATH=$(dirname "$0")
 libnocache="$NOCACHE_PATH/nocache.so"

-if [ -n "$LD_PRELOAD" ]; then
-    export LD_PRELOAD="$libnocache $LD_PRELOAD"
-else
-    export LD_PRELOAD="$libnocache"
+export LD_PRELOAD="$libnocache $LD_PRELOAD"
+
+if [ "$1" = "-n" ]; then
+    export NOCACHE_NR_FADVISE="$2"
+    shift 2
 fi

 if [ "$1" = "-n" ]; then

--- a/nocache.global
+++ b/nocache.global
-#!/bin/sh
-libnocache="/usr/local/lib/nocache.so"
+#!/bin/sh 
+BASEDIR="/usr/local"
+libnocache="$BASEDIR/lib/nocache.so"

-if [ -n "$LD_PRELOAD" ]; then
-    export LD_PRELOAD="$libnocache $LD_PRELOAD"
-else
-    export LD_PRELOAD="$libnocache"
+export LD_PRELOAD="$libnocache $LD_PRELOAD"
+
+if [ "$1" = "-n" ]; then
+    export NOCACHE_NR_FADVISE="$2"
+    shift 2
 fi

 exec "$@"