From 77e1744846ea9a014ac8327e19628e07a13a9d40 Mon Sep 17 00:00:00 2001 From: Nikolaos Kakouros <nkak@kth.se> Date: Thu, 28 Jan 2021 17:12:44 +0100 Subject: [PATCH] wip --- misc/git/hooks/post-checkout/50-submodules | 2 +- misc/git/hooks/post-merge/50-submodules | 2 +- misc/git/hooks/pre-push/60-origin | 2 +- misc/git/hooks/pre-push/70-mirrors | 2 +- vendor/autohook | 2 +- vendor/bash-infinity | 2 +- vendor/go-script-bash | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/misc/git/hooks/post-checkout/50-submodules b/misc/git/hooks/post-checkout/50-submodules index b7f2424..e5a5758 100755 --- a/misc/git/hooks/post-checkout/50-submodules +++ b/misc/git/hooks/post-checkout/50-submodules @@ -1,4 +1,4 @@ #!/usr/bin/env bash git submodule update -gilt --config "vendor/gilt.developer.yml" overlay +gilt --config "vendor/gilt.yml" overlay diff --git a/misc/git/hooks/post-merge/50-submodules b/misc/git/hooks/post-merge/50-submodules index b7f2424..e5a5758 100755 --- a/misc/git/hooks/post-merge/50-submodules +++ b/misc/git/hooks/post-merge/50-submodules @@ -1,4 +1,4 @@ #!/usr/bin/env bash git submodule update -gilt --config "vendor/gilt.developer.yml" overlay +gilt --config "vendor/gilt.yml" overlay diff --git a/misc/git/hooks/pre-push/60-origin b/misc/git/hooks/pre-push/60-origin index 22f5223..d773609 100755 --- a/misc/git/hooks/pre-push/60-origin +++ b/misc/git/hooks/pre-push/60-origin @@ -26,7 +26,7 @@ while read -r url \ echo -e "\033[0;33mPushing to origin: $url\033[0m" git push "origin" --all fi -done <<<"$(grep -A2 -- '- git:' vendor/gilt.developer.yml)" +done <<<"$(grep -A2 -- '- git:' vendor/gilt.yml)" cd "$old_dir" || exit 1 diff --git a/misc/git/hooks/pre-push/70-mirrors b/misc/git/hooks/pre-push/70-mirrors index 9f2735b..e35f3f7 100755 --- a/misc/git/hooks/pre-push/70-mirrors +++ b/misc/git/hooks/pre-push/70-mirrors @@ -13,7 +13,7 @@ import yaml # if random.randint(1, 4) != 3: # sys.exit() -with open("vendor/gilt.developer.yml", "r") as stream: +with open("vendor/gilt.yml", "r") as stream: config = yaml.safe_load(stream) old_dir = os.getcwd() diff --git a/vendor/autohook b/vendor/autohook index ad679fe..a3bf86c 160000 --- a/vendor/autohook +++ b/vendor/autohook @@ -1 +1 @@ -Subproject commit ad679fecfcbdf671453af7b45cbab52b8e29e5dd +Subproject commit a3bf86c36e566ff96b40347c76fd66cb04c6e034 diff --git a/vendor/bash-infinity b/vendor/bash-infinity index a939f7b..f9a62a1 160000 --- a/vendor/bash-infinity +++ b/vendor/bash-infinity @@ -1 +1 @@ -Subproject commit a939f7b167eec45bdad643269f28dbeb87c4ec8c +Subproject commit f9a62a1ec26384b61ff562f22ab32ecab9d817a0 diff --git a/vendor/go-script-bash b/vendor/go-script-bash index b098f3f..19aa90c 160000 --- a/vendor/go-script-bash +++ b/vendor/go-script-bash @@ -1 +1 @@ -Subproject commit b098f3f9124daa78bc5da15b86153e81060f4e5f +Subproject commit 19aa90c744e5a1adae6d5f9583019658de7e35fe -- GitLab