j3g
/
osxenv_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MOD: modified for Android Studio bug, but then changed back, also figured out that the environment vars were being set twice, so removed the duplicates

This commit is contained in:
JohnE 2016-12-14 02:03:39 -08:00
parent 28d18cccb0
commit 5d95e576b6
2 changed files with 344 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.bash_android
View File

@ -17,7 +17,6 @@ BUILD_TOOLS_VER='25.0.0'
# sudo ln -s "/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home" /usr/local/opt/java-home
JAVA_HOME='/usr/local/opt/java-home'
# path to binaries
export JAVA_BIN=$JAVA_HOME/bin
export ANT_BIN=$ANT_HOME/bin
@ -26,8 +25,6 @@ export PATH=$ANT_BIN:$JAVA_BIN:$PATH
# environment vars -- used by build tools (ant)
export JAVA_HOME=$JAVA_HOME
export ANT_HOME=$ANT_HOME
export ANDROID_SDK_HOME=$ANDROID_SDK_HOME
export ANDROID_HOME=$ANDROID_SDK_HOME
# set path to android tool binaries
export PATH=$ANDROID_SDK_HOME/build-tools/$BUILD_TOOLS_VER:$PATH
@ -44,3 +41,5 @@ export PATH=$ANDROID_NDK/build/tools:$PATH
alias adbback='adb backup -f myAppBackup.ab' #com.corp.appName
alias adconv="dd if=myAppBackup.ab bs=24 skip=1 | $OSSL zlib -d > myAppBackup.tar"
# 12/14/2016 had to unset the variable to get virtual devices working
#unset ANDROID_SDK_HOME

693
settings/mac_bash.sublime-workspace
View File

@ -55,7 +55,7 @@
"file": "/Users/j3g/.bash_android",
"settings":
{
"buffer_size": 1337,
"buffer_size": 1509,
"encoding": "UTF-8",
"line_ending": "Unix"
}
@ -129,7 +129,7 @@
"file": "/Users/j3g/.bash_history",
"settings":
{
"buffer_size": 7470,
"buffer_size": 10662,
"line_ending": "Unix"
}
}
@ -211,6 +211,11 @@
},
"file_history":
[
"/Users/j3g/.android/avd/Nexus_5_API_25.avd/config.ini",
"/Users/j3g/.android/avd/Nexus_5_API_25.ini",
"/usr/local/CODEOFCONDUCT.md",
"/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/ASSEMBLY_EXCEPTION",
"/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/release",
"/Users/j3g/Documents/ADAPTERS.TXT",
"/Users/j3g/dev/scripts/examples.sh",
"/Volumes/D1/android_x86_vm/Android_4.4.vmwarevm/Android_4.4.vmx",
@ -333,12 +338,7 @@
"/D/j3g/dev/sellit/website/file_upload_ex/sftp-config.json",
"/D/j3g/dev/sellit/website/dragdrop/dragdrop/cloudfiles-test/views.py",
"/D/j3g/dev/sellit/website/django_sandbox/urls.py",
"/D/j3g/dev/sellit/website/django_sandbox/helloworld/templates/index.html",
"/D/j3g/dev/sellit/website/django_sandbox/helloworld/templates/base.html",
"/D/j3g/dev/sellit/website/django_sandbox/helloworld/templates/picture_detail.html",
"/D/j3g/dev/sellit/website/example_code/html5-file-upload/post_file.php",
"/D/apps/SublimeText2.0.1_x64/Data/Packages/User/Preferences.sublime-settings",
"/D/j3g/dev/sellit/website/django_sandbox/helloworld/models.py"
"/D/j3g/dev/sellit/website/django_sandbox/helloworld/templates/index.html"
],
"find":
{
@ -356,6 +356,12 @@
"case_sensitive": false,
"find_history":
[
"android",
"ANDROID",
"android",
"ANDROID",
"Android",
"ANDROID",
"dryrun",
"\n#",
"launcher",
@ -410,8 +416,8 @@
"selection":
[
[
0,
0
431,
431
]
],
"settings":
@ -440,61 +446,61 @@
},
"bracket_highlighter.regions":
[
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content"
"bh_round_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content"
],
"csslint_options":
{
@ -588,7 +594,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 1,
"stack_index": 4,
"type": "text"
},
{
@ -693,61 +699,61 @@
},
"bracket_highlighter.regions":
[
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content"
"bh_round_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content"
],
"csslint_options":
{
@ -841,7 +847,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 12,
"stack_index": 3,
"type": "text"
},
{
@ -946,61 +952,61 @@
},
"bracket_highlighter.regions":
[
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content"
"bh_round_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content"
],
"csslint_options":
{
@ -1094,7 +1100,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 11,
"stack_index": 2,
"type": "text"
},
{
@ -1135,61 +1141,61 @@
},
"bracket_highlighter.regions":
[
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content"
"bh_round_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content"
],
"incomplete_sync": null,
"remote_loading": false,
@ -1200,7 +1206,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 7,
"stack_index": 1,
"type": "text"
},
{
@ -1209,15 +1215,15 @@
"semi_transient": false,
"settings":
{
"buffer_size": 1337,
"buffer_size": 1509,
"regions":
{
},
"selection":
[
[
123,
149
991,
991
]
],
"settings":
@ -1286,27 +1292,117 @@
{
"close":
{
"1":
[
149,
150
]
},
"icon":
{
"1":
[
"Packages/BracketHighlighter/icons/single_quote.png",
"brackethighlighter.default"
]
},
"open":
{
"1":
[
122,
123
]
},
"unmatched":
{
}
},
"bracket_highlighter.regions":
[
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content"
],
"incomplete_sync": null,
"remote_loading": false,
"synced": false,
"syntax": "Packages/ShellScript/Shell-Unix-Generic.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 0,
"type": "text"
},
{
"buffer": 5,
"file": "/Users/j3g/.bash_python",
"semi_transient": false,
"settings":
{
"buffer_size": 1023,
"regions":
{
},
"selection":
[
[
594,
594
]
],
"settings":
{
"bracket_highlighter.busy": false,
"bracket_highlighter.locations":
{
"close":
{
},
"icon":
{
},
"open":
{
},
"unmatched":
{
@ -1373,118 +1469,13 @@
"incomplete_sync": null,
"remote_loading": false,
"synced": false,
"syntax": "Packages/ShellScript/Shell-Unix-Generic.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 0,
"type": "text"
},
{
"buffer": 5,
"file": "/Users/j3g/.bash_python",
"semi_transient": false,
"settings":
{
"buffer_size": 1023,
"regions":
{
},
"selection":
[
[
594,
594
]
],
"settings":
{
"bracket_highlighter.busy": false,
"bracket_highlighter.locations":
{
"close":
{
},
"icon":
{
},
"open":
{
},
"unmatched":
{
}
},
"bracket_highlighter.regions":
[
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content"
],
"incomplete_sync": null,
"remote_loading": false,
"synced": false,
"syntax": "Packages/ShellScript/Shell-Unix-Generic.sublime-syntax"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 10,
"stack_index": 5,
"type": "text"
},
{
@ -1678,7 +1669,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 8,
"stack_index": 11,
"type": "text"
},
{
@ -1931,7 +1922,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 9,
"stack_index": 12,
"type": "text"
},
{
@ -2030,61 +2021,61 @@
},
"bracket_highlighter.regions":
[
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_c_define",
"bh_c_define_center",
"bh_c_define_open",
"bh_c_define_close",
"bh_c_define_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_single_quote",
"bh_single_quote_center",
"bh_single_quote_open",
"bh_single_quote_close",
"bh_single_quote_content",
"bh_square",
"bh_square_center",
"bh_square_open",
"bh_square_close",
"bh_square_content",
"bh_double_quote",
"bh_double_quote_center",
"bh_double_quote_open",
"bh_double_quote_close",
"bh_double_quote_content",
"bh_tag",
"bh_tag_center",
"bh_tag_open",
"bh_tag_close",
"bh_tag_content",
"bh_default",
"bh_default_center",
"bh_default_open",
"bh_default_close",
"bh_default_content",
"bh_round",
"bh_round_center",
"bh_round_open",
"bh_round_close",
"bh_round_content"
"bh_round_content",
"bh_unmatched",
"bh_unmatched_center",
"bh_unmatched_open",
"bh_unmatched_close",
"bh_unmatched_content",
"bh_regex",
"bh_regex_center",
"bh_regex_open",
"bh_regex_close",
"bh_regex_content",
"bh_angle",
"bh_angle_center",
"bh_angle_open",
"bh_angle_close",
"bh_angle_content",
"bh_curly",
"bh_curly_center",
"bh_curly_open",
"bh_curly_close",
"bh_curly_content"
],
"incomplete_sync": null,
"remote_loading": false,
@ -2095,7 +2086,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 2,
"stack_index": 6,
"type": "text"
},
{
@ -2305,7 +2296,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 3,
"stack_index": 7,
"type": "text"
},
{
@ -2367,7 +2358,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 4,
"stack_index": 8,
"type": "text"
},
{
@ -2472,7 +2463,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 5,
"stack_index": 9,
"type": "text"
},
{
@ -2481,7 +2472,7 @@
"semi_transient": false,
"settings":
{
"buffer_size": 7470,
"buffer_size": 10662,
"regions":
{
},
@ -2504,7 +2495,7 @@
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 6,
"stack_index": 10,
"type": "text"
}
]