Skip to content

Commit 4cd139f

Browse files
committed
Adapt to work with Android/termux
1 parent 7db0157 commit 4cd139f

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

.bashrc

+15-2
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,31 @@ fi
116116
# export GIT_TEMPLATE_DIR="$HOME"/.gittemplate
117117
# fi
118118

119+
if ! [ -v XDG_RUNTIME_DIR ]; then
120+
export XDG_RUNTIME_DIR=/run/user/`id -u`/
121+
if ! [ -d "$XDG_RUNTIME_DIR" ]; then
122+
mkdir -p "$XDG_RUNTIME_DIR"
123+
chmod 755 "$XDG_RUNTIME_DIR"
124+
fi
125+
fi
126+
119127
# setup ssh-agent
120128
# only setup ssh agent if not previosly set
121129
if ! [ -v SSH_AUTH_SOCK ]; then
122-
SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}gnupg/ssh.sock
130+
SSH_DIR=${XDG_RUNTIME_DIR}gnupg
131+
if ! [ -d "$SSH_DIR" ]; then
132+
mkdir -p "$SSH_DIR"
133+
chmod 700 "$SSH_DIR"
134+
fi
135+
SSH_AUTH_SOCK="$SSH_DIR"/ssh.sock
123136
if [ -S "$SSH_AUTH_SOCK" ]; then
124137
export SSH_AUTH_SOCK
125138
if [ -f "$HOME/.ssh/ssh_pid" ]; then
126139
SSH_AGENT_PID="`cat "$HOME"/.ssh/ssh_pid`"
127140
export SSH_AGENT_PID
128141
fi
129142
else
130-
eval "`ssh-agent -s -a $SSH_AUTH_SOCK`" > /dev/null
143+
eval "`ssh-agent -s -a "$SSH_AUTH_SOCK"`" > /dev/null
131144
if ! [ -d "$HOME"/.ssh ]; then
132145
mkdir -p "$HOME/.ssh"
133146
chmod 700 "$HOME/.ssh"

bashrc-wsl.bash

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
# put your script here for WSL only
44

5-
if grep '[Mm]icrosoft' /proc/version > /dev/null; then
5+
if uname -a | grep android &> /dev/null; then
6+
export ANDROID=true
7+
else
8+
export ANDROID=false
9+
fi
10+
if grep '[Mm]icrosoft' /proc/version &> /dev/null; then
611
export WSL=true
712
else
813
export WSL=false

0 commit comments

Comments
 (0)