summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob McDonnell <jacob@jacobmcdonnell.com>2024-12-05 14:34:10 -0500
committerJacob McDonnell <jacob@jacobmcdonnell.com>2024-12-05 14:34:10 -0500
commit1a1bc3c5c719e22445f8d00d95a149201a5041e7 (patch)
tree698b9e0164dfdc79219026c580cb884d97b1f719
parent32b531be0490a0b79d777dbfd15eeafb908e1276 (diff)
Bug Fixes
-rwxr-xr-xdev-env9
-rwxr-xr-xrun2
-rwxr-xr-xruns/neovim4
-rwxr-xr-xruns/notes2
-rwxr-xr-xruns/plan92
-rwxr-xr-xutil5
6 files changed, 12 insertions, 12 deletions
diff --git a/dev-env b/dev-env
index 2fa9ae2..4f3443c 100755
--- a/dev-env
+++ b/dev-env
@@ -2,7 +2,7 @@
source util
-dry="1"
+dry="0"
while [[ $# -gt 0 ]]; do
if [[ "$1" == "--dry" ]]; then
dry="1"
@@ -10,17 +10,16 @@ while [[ $# -gt 0 ]]; do
shift
done
-#cd $target/dotfiles
+cd $target/dotfiles
log "Copying Scripts"
-scripts="$(find ./scripts -maxdepth 1 -mindepth 1 -perm +111 -type f)"
+scripts="$(find ./scripts -maxdepth 1 -mindepth 1 -executable -type f)"
for script in $scripts; do
log $script
copy_file "$script" "$target/bin"
done
log "Copying Configs"
-copy_dir ".config" $HOME
-copy_file ".config/.profile" $HOME
+copy_dir .config $HOME/.config
copy_file ".config/.profile" $HOME
copy_file ".config/shells/zsh/.zshrc" $HOME
diff --git a/run b/run
index 8320158..8cd3d61 100755
--- a/run
+++ b/run
@@ -17,7 +17,7 @@ done
log "$script_dir -- $filter"
cd $script_dir
-scripts="$(find ./runs -maxdepth 1 -mindepth 1 -perm +111 -type f)"
+scripts="$(find ./runs -maxdepth 1 -mindepth 1 -executable -type f)"
for script in $scripts; do
if echo "$script" | grep -qv "$filter"; then
log "filtering $script"
diff --git a/runs/neovim b/runs/neovim
index b12a4a5..c00b9b1 100755
--- a/runs/neovim
+++ b/runs/neovim
@@ -1,11 +1,11 @@
#!/bin/zsh
-source ../util
+source $HOME/personal/dotfiles/util
version="v0.10.2"
git clone -b $version https://github.com/neovim/neovim.git $target/neovim
-sudo dnf install -y cmake gettext lua lua-libs
+#sudo dnf install -y cmake gettext lua lua-libs
cd $target/neovim
make CMAKE_BUILD_TYPE=RelWithDebInfo
make CMAKE_INSTALL_PREFIX=$target install
diff --git a/runs/notes b/runs/notes
index de5e525..d667961 100755
--- a/runs/notes
+++ b/runs/notes
@@ -1,6 +1,6 @@
#!/bin/zsh
-source ../util
+source $HOME/personal/dotfiles/util
git clone git@github.com:JacobMcDonnell/notes.git $target/notes
diff --git a/runs/plan9 b/runs/plan9
index 7beff82..c725423 100755
--- a/runs/plan9
+++ b/runs/plan9
@@ -1,6 +1,6 @@
#!/bin/zsh
-source ../util
+source $HOME/personal/dotfiles/util
git clone https://github.com/9fans/plan9port.git $target/plan9
cd $target/plan9
diff --git a/util b/util
index be30a87..58cad15 100755
--- a/util
+++ b/util
@@ -6,9 +6,9 @@ target="$HOME/personal"
log() {
if [[ $dry == "1" ]]; then
- echo "[DRY_RUN]: $1"
+ echo "[DRY_RUN]: $@"
else
- echo "$1"
+ echo "$@"
fi
}
@@ -26,6 +26,7 @@ copy_dir() {
pushd $from
dirs="$(find . -maxdepth 1 -mindepth 1 -type d)"
for dir in $dirs; do
+ log "Copying $dir"
execute rm -rf $to/$dir
execute cp -r $dir $to/$dir
done