From febbe9627b6e8e319e987acb515a64e5c0a098a8 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Fri, 6 Jun 2014 12:00:33 +0200 Subject: [PATCH] [zsh] update env variable --- .zsh/host:mmaret-geny/Environment.zsh | 2 +- .zsh/host:zebulon/Environment.zsh | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.zsh/host:mmaret-geny/Environment.zsh b/.zsh/host:mmaret-geny/Environment.zsh index 86a9175..daf182d 100755 --- a/.zsh/host:mmaret-geny/Environment.zsh +++ b/.zsh/host:mmaret-geny/Environment.zsh @@ -6,7 +6,7 @@ export MY_PROJECT_TOOLCHAIN=$MY_PROJECT/prebuilts/gcc/linux-x86/arm/arm-linux-an export JAVA_HOME=/home/mmaret/local/jdk1.7.0_21 export DEBEMAIL=mmaret@genymobile.com export DEBFULLNAME=Mathieu Maret -export PATH=:$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools/$ANDROID_HOME/build-tools/android-4.2.2:$NDK_HOME:$PATH:$MY_PROJECT_TOOLCHAIN +export PATH=:$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools/:$ANDROID_HOME/build-tools/android-4.2.2:$NDK_HOME:$PATH:$MY_PROJECT_TOOLCHAIN diff --git a/.zsh/host:zebulon/Environment.zsh b/.zsh/host:zebulon/Environment.zsh index c9686a6..8449bb6 100755 --- a/.zsh/host:zebulon/Environment.zsh +++ b/.zsh/host:zebulon/Environment.zsh @@ -3,7 +3,8 @@ #export ftp_proxy="http://grp-horus:3128" #Java And Android Env -export ECLIPSE_HOME=/home/mathieu/Outils/eclipse +export ECLIPSE_HOME=/home/mathieu/eclipse/adt-bundle-linux-x86_64-20131030/eclipse +export ANDROID_HOME=/home/mathieu/eclipse/adt-bundle-linux-x86_64-20131030/sdk/ #Perso Bin export PATH=$HOME/bin/bin:$HOME/bin:$PATH @@ -13,14 +14,14 @@ export EDITOR=/usr/bin/vim #export https_proxy="http://grp-horus:3128" #export ftp_proxy="http://grp-horus:3128" export ANDROID_DIR=/home/mathieu/android/android-sdk-linux_x86-1.5_r1 -export ANDROID_HOME=/opt/android-sdk/ -export ANDROID_SKD=/opt/android-sdk/platforms/androoid-4 -export ANDROID_NDK=/opt/android-ndk/ +#export ANDROID_HOME=/opt/android-sdk +export ANDROID_SKD=/opt/android-sdk/platforms/android-4 +export ANDROID_NDK=/opt/android-ndk #export PATH=$ANDROID_DIR/tools:$PATH #export JAVA_HOME=/usr/lib/jvm/java-6-sun -export JAVA_HOME=/usr/lib/jvm/java-6-openjdk +export JAVA_HOME=/usr/lib/jvm/java-7-openjdk/jre/ export CATALINA_HOME=/usr/share/tomcat6 -export PATH=$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ANDROID_NDK:$ECLIPSE_HOME:$PATH +export PATH=$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK:$ECLIPSE_HOME:$PATH