From b36b66475f450e80443c90a3046ae636162620eb Mon Sep 17 00:00:00 2001 From: James Date: Sat, 18 May 2019 15:27:48 -0400 Subject: [PATCH 1/5] Update bashrc --- bashrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bashrc b/bashrc index aaae815..93c7be8 100755 --- a/bashrc +++ b/bashrc @@ -1,8 +1,8 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export PATH="$DIR:$DIR/bin:$DIR/usr/bin:$PATH" -export CPATH="$DIR/usr/include:$DIR/usr/include/x86_64-linux-gnu:$CPATH" -export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" -export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$LIBRARY_PATH" +export PATH="$DIR:$DIR/bin:$DIR/usr/bin:$DIR/usr/sbin:$PATH" +export CPATH="$DIR/usr/include:$DIR/usr/include:$CPATH" +export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$LD_LIBRARY_PATH" +export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$LIBRARY_PATH" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$DIR/usr/share/pkgconfig/" From a8d6cc43b72327f21f9a1eadd786ca519e6d6a3b Mon Sep 17 00:00:00 2001 From: James Date: Sat, 18 May 2019 15:36:53 -0400 Subject: [PATCH 2/5] Update bashrc --- bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index 93c7be8..be87fba 100755 --- a/bashrc +++ b/bashrc @@ -3,6 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH="$DIR:$DIR/bin:$DIR/usr/bin:$DIR/usr/sbin:$PATH" export CPATH="$DIR/usr/include:$DIR/usr/include:$CPATH" -export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$LD_LIBRARY_PATH" -export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$LIBRARY_PATH" +export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" +export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$LIBRARY_PATH" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$DIR/usr/share/pkgconfig/" From 98d5af265cfc1bb0dd82a22f1b71aef15e66ad7d Mon Sep 17 00:00:00 2001 From: James Date: Sat, 18 May 2019 15:55:00 -0400 Subject: [PATCH 3/5] Update bashrc --- bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index be87fba..9949a11 100755 --- a/bashrc +++ b/bashrc @@ -3,6 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH="$DIR:$DIR/bin:$DIR/usr/bin:$DIR/usr/sbin:$PATH" export CPATH="$DIR/usr/include:$DIR/usr/include:$CPATH" -export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" -export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$LIBRARY_PATH" +export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$DIR/deb/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" +export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$DIR/deb/usr/lib/x86_64-linux-gnu:$LIBRARY_PATH" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$DIR/usr/share/pkgconfig/" From 31b5347b57eb3b3c6719a029bc8fda6f849e1eb6 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 27 May 2019 14:36:16 -0400 Subject: [PATCH 4/5] Update bashrc --- bashrc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bashrc b/bashrc index 9949a11..5bc906e 100755 --- a/bashrc +++ b/bashrc @@ -1,8 +1,11 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export PATH="$DIR:$DIR/bin:$DIR/usr/bin:$DIR/usr/sbin:$PATH" -export CPATH="$DIR/usr/include:$DIR/usr/include:$CPATH" -export LD_LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$DIR/deb/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" -export LIBRARY_PATH="$DIR/usr/lib:$DIR/usr/lib:$DIR/usr/lib/x86_64-linux-gnu:$DIR/deb/usr/lib/x86_64-linux-gnu:$LIBRARY_PATH" -export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$DIR/usr/share/pkgconfig/" +for ROOT in $DIR $DIR/deb +do +export PATH="$DIR:$DIR/bin:$ROOT/usr/bin:$ROOT/usr/sbin:$PATH" +export CPATH="$ROOT/include:$ROOT/usr/include:$CPATH" +export LD_LIBRARY_PATH="$ROOT/usr/lib:$ROOT/lib:$ROOT/usr/lib/x86_64-linux-gnu:$ROOT/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" +export LIBRARY_PATH="$ROOT/usr/lib:$ROOT/lib:$ROOT/usr/lib/x86_64-linux-gnu:$ROOT/lib/x86_64-linux-gnu:$LIBRARY_PATH" +export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$ROOT/share/pkgconfig/" +done From 641d8c467bd7db911e435cc3d92c1b10e691d441 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 27 May 2019 15:12:47 -0400 Subject: [PATCH 5/5] Update bashrc --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index 5bc906e..e46942b 100755 --- a/bashrc +++ b/bashrc @@ -3,7 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" for ROOT in $DIR $DIR/deb do -export PATH="$DIR:$DIR/bin:$ROOT/usr/bin:$ROOT/usr/sbin:$PATH" +export PATH="$DIR:$DIR/bin:$DIR/sbin:$ROOT/usr/bin:$ROOT/usr/sbin:$PATH" export CPATH="$ROOT/include:$ROOT/usr/include:$CPATH" export LD_LIBRARY_PATH="$ROOT/usr/lib:$ROOT/lib:$ROOT/usr/lib/x86_64-linux-gnu:$ROOT/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" export LIBRARY_PATH="$ROOT/usr/lib:$ROOT/lib:$ROOT/usr/lib/x86_64-linux-gnu:$ROOT/lib/x86_64-linux-gnu:$LIBRARY_PATH"