Skip to content

Commit

Permalink
fix a couple of go program installs
Browse files Browse the repository at this point in the history
  • Loading branch information
pjkaufman committed Nov 14, 2024
1 parent 2c82b4b commit 0ddd8fa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion install/setup_go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

install-go "$GO_VERSION"

go_install_package "shfmt" "mvdan.cc/sh/v3/cmd/shfmt"
go_install_package "mvdan.cc/sh/v3/cmd/shfmt" "shfmt"

git submodule init

Expand Down
2 changes: 1 addition & 1 deletion install/setup_sway.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ for pkg in "${sway_packages_to_install[@]}"; do install_apt_package "$pkg"; done
install_apt_package "pactl" "pulseaudio-utils" # sound changes

# clipboard manager
go_install_package "cliphist" "go.senan.xyz/cliphist"
go_install_package "go.senan.xyz/cliphist" "cliphist"

# make sure wlroots and its portal is installed
install_apt_package_by_package_name_only "wlroots"
Expand Down
2 changes: 2 additions & 0 deletions install/setup_vscode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ function copy_and_backup() {

# this may need some modification to work better on initial setup since `iswsl` may not be available.
if iswsl; then
[[ -z "$WINDOWS_USER" ]] && echo "Please define a WINDOWS_USER variable to setup vscode." && return

# symlinks do not really work in wsl so we have to copy the value over to the Windows location
copy_and_backup "$DOTFILES/vscode/settings/keybindings.json" "/mnt/c/Users/$WINDOWS_USER/AppData/Roaming/Code/User/keybindings.json"
copy_and_backup "$DOTFILES/vscode/settings/settings.json" "/mnt/c/Users/$WINDOWS_USER/AppData/Roaming/Code/User/settings.json"
Expand Down

0 comments on commit 0ddd8fa

Please sign in to comment.