Skip to content

Commit 6cdd627

Browse files
mau-mauricelimmau-mauricelim
committed
Fix q config logic
1 parent 69ef839 commit 6cdd627

File tree

4 files changed

+59
-55
lines changed

4 files changed

+59
-55
lines changed

‎.commonrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ addToPathFront /opt/nvim-linux-x86_64/bin
6363
addToPath "$XDG_CONFIG_HOME/git/git-scripts"
6464

6565
# Source the shell dotfiles
66-
for file in $XDG_CONFIG_HOME/{alias,q}/*.sh; do
66+
for file in $(find -L $XDG_CONFIG_HOME/{alias,q} -type f -name '*.sh'); do
6767
sourceFile "$file"
6868
done
6969
unset file

‎.config/nvim/lazy-lock.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
44
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
55
"cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
6-
"conform.nvim": { "branch": "master", "commit": "b529dd4897c85c3188cc787084089a9d55843093" },
6+
"conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
77
"csvview.nvim": { "branch": "main", "commit": "c44d9ed0664de67f3ac333fe83cb187ab241f82a" },
88
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
99
"duck.nvim": { "branch": "main", "commit": "d8a6b08af440e5a0e2b3b357e2f78bb1883272cd" },
1010
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
1111
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
1212
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
1313
"gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
14-
"grug-far.nvim": { "branch": "main", "commit": "6fd719634c529bfbfe031a03b7af9d728d849dc7" },
15-
"incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" },
14+
"grug-far.nvim": { "branch": "main", "commit": "c36f5f9b53f12a60aa53d42282e8ae78aef72178" },
15+
"incline.nvim": { "branch": "main", "commit": "0fd2d5a27504dba7fdc507a53275f22c081fe640" },
1616
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
1717
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
1818
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
@@ -23,10 +23,10 @@
2323
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
2424
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
2525
"mini.files": { "branch": "main", "commit": "49c855977e9f4821d1ed8179ed44fe098b93ea2a" },
26-
"mini.nvim": { "branch": "main", "commit": "5a10dfb3ab49b3ee2425bc2c215b5067ccce1c79" },
26+
"mini.nvim": { "branch": "main", "commit": "35e1767f4cd7dde51256eabae7349a5283a43cba" },
2727
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
2828
"nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
29-
"nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" },
29+
"nvim-lspconfig": { "branch": "master", "commit": "a182334ba933e58240c2c45e6ae2d9c7ae313e00" },
3030
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
3131
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
3232
"onedark.nvim": { "branch": "master", "commit": "11de4da47f3e69cb70c3ae9816bd8af166cbe121" },

‎.config/q/config.sh‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,62 @@ q_home=$HOME/q
66

77
# Check if WSL
88
if isWsl; then
9-
# Check if kdb+ binaries exist
10-
if [ -d $win_q_home ]; then
11-
# Copy q version if it does not exist
12-
if ! find "$q_home" -maxdepth 1 -type d -name '[0-9].[0-9]' | grep -q .; then
13-
echo "🚀 Setting up kdb+ binaries for the first time"
14-
mkdir -p $q_home
15-
cp $win_q_home/kc.lic $q_home
16-
# Copy q version programmatically
17-
if /bin/ls "$win_q_home"/[0-9].[0-9] >/dev/null 2>&1; then
18-
for VER in $(/bin/ls -d $win_q_home/[0-9].[0-9]); do
19-
VER=$(echo $VER|awk -F'/' '{print $NF}')
20-
mkdir -p $q_home/$VER
21-
cp -r $win_q_home/$VER/{l64,q.k} $q_home/$VER
22-
done
23-
fi
24-
fi
25-
fi
269
ID=$(awk -F= '$1=="ID" { print $2; }' /etc/os-release)
2710
case $ID in
2811
# HACK: For distros that uses musl but does not support gcompat:
2912
# - The convoluted solution is to run the windows kdb+ binaries
3013
# - WARN: There may be compatibility issues
31-
muslDistro)
32-
# Set q version alias programmatically
33-
if /bin/ls "$win_q_home"/[0-9].[0-9] >/dev/null 2>&1; then
14+
musl|unsupported|distro|names)
15+
WIN_Q=true
16+
;;
17+
*)
18+
;;
19+
esac
20+
21+
# Check if kdb+ binaries exist
22+
if [ -d $win_q_home ]; then
23+
if [ ! -d "$q_home" ]; then
24+
echo "🚀 Setting up kdb+ binaries for the first time"
25+
mkdir $q_home
26+
elif ! find "$q_home" -mindepth 1 -maxdepth 1 -type d -name '[0-9].[0-9]' | grep -q .; then
27+
echo "🚀 Setting up kdb+ binaries for the first time"
28+
fi
29+
if [ -f "$win_q_home/kc.lic" ] && [ ! -f "$q_home/kc.lic" ]; then
30+
cp $win_q_home/kc.lic $q_home
31+
fi
32+
# Check if q versions exists
33+
if find "$win_q_home" -mindepth 1 -maxdepth 1 -type d -name '[0-9].[0-9]' | grep -q .; then
34+
# Copy q versions programmatically
3435
for VER in $(/bin/ls -d $win_q_home/[0-9].[0-9]); do
3536
VER=$(echo $VER|awk -F'/' '{print $NF}')
36-
# HACK: Need to copy q version q.k file to C:\q
37-
# WARN: Do not set windows environment QHOME and QLIC
38-
eval "alias $(echo q$VER|tr -d '.')='cp $win_q_home/$VER/q.k $win_q_home && $win_q_home/$VER/w64/q.exe'"
37+
if [ ! -d "$q_home/$VER" ]; then
38+
mkdir $q_home/$VER
39+
cp -r $win_q_home/$VER/{l64,q.k} $q_home/$VER
40+
fi
41+
if [ "$WIN_Q" = "true" ]; then
42+
# HACK: Need to copy q version q.k file to C:\q
43+
# WARN: Do not set windows environment QHOME and QLIC
44+
eval "alias $(echo q$VER|tr -d '.')='cp $win_q_home/$VER/q.k $win_q_home && $win_q_home/$VER/w64/q.exe'"
45+
# Set default q version
46+
if [ "$VER" = "$q_ver" ]; then
47+
alias q="cp $win_q_home/$q_ver/q.k $win_q_home && $win_q_home/$q_ver/w64/q.exe"
48+
fi
49+
fi
3950
done
51+
[ "$WIN_Q" = "true" ] && return
4052
fi
41-
# Set default q version
42-
[ -d $win_q_home/$q_ver ] && alias q="cp $win_q_home/$q_ver/q.k $win_q_home && $win_q_home/$q_ver/w64/q.exe"
43-
return
44-
;;
45-
*)
46-
;;
47-
esac
53+
fi
4854
fi
4955

50-
q_home=$HOME/q
5156
[ -d $q_home ] &&\
5257
export QLIC=$q_home &&\
5358
export q_home || return
5459
[ -f $q_home/q.q ] && export QINIT=$q_home/q.q
5560

56-
if [ -d $HOME/Qurious ]; then
57-
if readlink -m $q_home/q.q | grep -q '/dotfiles/'; then
58-
ln -sf $q_home/q.q $HOME/Qurious/q.q
59-
ln -sf $q_home/q.test.q $HOME/Qurious/q.test.q
60-
fi
61-
fi
61+
[ -d $HOME/Qurious ] && [ ! -L $q_home/q.q ] &&\
62+
echo "🔗 Symlinking Qurious to q.q and q.test.q" &&\
63+
ln -sf $q_home/q.q $HOME/Qurious/q.q &&\
64+
ln -sf $q_home/q.test.q $HOME/Qurious/q.test.q
6265

6366
run_q() {
6467
VER=$1
@@ -74,16 +77,17 @@ run_q() {
7477
fi
7578
eval "$QCMD"
7679
}
77-
# Set q version alias programmatically if directory exist
78-
if find "$q_home" -maxdepth 1 -type d -name '[0-9].[0-9]' | grep -q .; then
79-
if /bin/ls "$q_home"/[0-9].[0-9] >/dev/null 2>&1; then
80-
for VER in $(/bin/ls -d $q_home/[0-9].[0-9]); do
81-
VER=$(echo $VER|awk -F'/' '{print $NF}')
82-
eval "alias $(echo q$VER|tr -d '.')='run_q '$VER"
83-
done
84-
fi
80+
# Check if q versions exists
81+
if find "$q_home" -mindepth 1 -maxdepth 1 -type d -name '[0-9].[0-9]' | grep -q .; then
82+
# Set q versions alias programmatically
83+
for VER in $(/bin/ls -d $q_home/[0-9].[0-9]); do
84+
VER=$(echo $VER|awk -F'/' '{print $NF}')
85+
eval "alias $(echo q$VER|tr -d '.')='run_q '$VER"
86+
# Set default q version
87+
if [ "$VER" = "$q_ver" ]; then
88+
alias q="run_q $q_ver"
89+
fi
90+
done
8591
fi
86-
# Set default q version
87-
[ -d $q_home/$q_ver ] && alias q="run_q $q_ver"
8892
# List all available q versions
89-
alias qv="/bin/ls -d $q_home/[0-9].[0-9]"
93+
alias qv="ls -d $q_home/[0-9].[0-9]"

‎.stow-local-ignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ _darcs
2626
^/COPYING
2727

2828
docs
29-
q
29+
/q
3030
src
3131
tests
3232
^/Dockerfile.*

0 commit comments

Comments
 (0)