diff --git a/.config/setup/04-install-deb-packages.sh b/.config/setup/04-install-deb-packages.sh index a8d976f..70370d6 100755 --- a/.config/setup/04-install-deb-packages.sh +++ b/.config/setup/04-install-deb-packages.sh @@ -16,6 +16,7 @@ DEB_PKGS=( build-essential cargo cargo-doc + catatonit curl direnv emacs-mozc diff --git a/.config/setup/18-install-git-sync.sh b/.config/setup/18-install-live-git-repo-packages.sh similarity index 62% rename from .config/setup/18-install-git-sync.sh rename to .config/setup/18-install-live-git-repo-packages.sh index c5824c1..97c5a78 100755 --- a/.config/setup/18-install-git-sync.sh +++ b/.config/setup/18-install-live-git-repo-packages.sh @@ -3,4 +3,4 @@ set -euo pipefail IFS=$'\n\t' -resync-git-sync +resync-live-git-repo-packages diff --git a/.local/bin/resync-git-sync b/.local/bin/resync-git-sync deleted file mode 100755 index f167ca8..0000000 --- a/.local/bin/resync-git-sync +++ /dev/null @@ -1,13 +0,0 @@ -#! /usr/bin/bash - -set -euo pipefail -IFS=$'\n\t' - -REPO_DIR="$(systemd-path user-state-private)"/git-sync -if [ -d "${REPO_DIR}" ] -then - git -C "${REPO_DIR}" pull -else - cd "$(systemd-path user-state-private)" || exit - git clone https://github.com/simonthum/git-sync -fi diff --git a/.local/bin/resync-live-git-repo-packages b/.local/bin/resync-live-git-repo-packages new file mode 100755 index 0000000..bf0229a --- /dev/null +++ b/.local/bin/resync-live-git-repo-packages @@ -0,0 +1,24 @@ +#! /usr/bin/bash + +set -euo pipefail +IFS=$'\n\t' + +REPO_DIR="$(systemd-path user-state-private)"/agentbox +if [ -d "${REPO_DIR}" ] +then + git -C "${REPO_DIR}" pull +else + cd "$(systemd-path user-state-private)" || exit + git clone https://github.com/libohad-dev/agentbox + git -C "${REPO_DIR}" checkout podman + ln --symbolic "${REPO_DIR}"/agentbox ~/.local/bin/ +fi + +REPO_DIR="$(systemd-path user-state-private)"/git-sync +if [ -d "${REPO_DIR}" ] +then + git -C "${REPO_DIR}" pull +else + cd "$(systemd-path user-state-private)" || exit + git clone https://github.com/simonthum/git-sync +fi diff --git a/.local/bin/upgrade b/.local/bin/upgrade index 9e432c7..023622a 100755 --- a/.local/bin/upgrade +++ b/.local/bin/upgrade @@ -23,9 +23,9 @@ uv_update() { uv tool upgrade --all } -git_sync_update() { - echo Updating git-sync... - resync-git-sync +live_git_repo_update() { + echo Updating packages installed directly via git repos... + resync-live-git-repo-packages } podman_update() { @@ -41,5 +41,5 @@ emacs_update uv_update cargo_update ghup -git_sync_update +live_git_repo_update podman_update