From 27757ce591907a47b1f36183cc2116c2a4a59d1d Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:46:25 -0600 Subject: update deploy --- deploy.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 5ee9db3..f9ca634 100755 --- a/deploy.sh +++ b/deploy.sh @@ -39,6 +39,7 @@ cd "$HOME" ~/website/post-publish.sh sed -i 's/) .*/jjanzen@jjanzen.ca (jjanzen)' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From 270eb5d124fcb6105a963e024169ca965739d25e Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:48:52 -0600 Subject: echo commands --- deploy.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index f9ca634..0771010 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + if [ "$1" = "test" ]; then branch='test' location='/var/www/html-test' -- cgit v1.2.3 From 3614f3ae19185d72e18b351459df97b07570c9b0 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:50:01 -0600 Subject: fix sed syntax --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 0771010..4d52047 100755 --- a/deploy.sh +++ b/deploy.sh @@ -41,7 +41,7 @@ cd "$HOME" ~/website/post-publish.sh sed -i 's/) .*/jjanzen@jjanzen.ca (jjanzen)' ~/public_html/rss.xml +sed -i 's/.*/jjanzen@jjanzen.ca (jjanzen)/g' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From 33e40a56dc9a8b596972e1a06bb7aad7ec56c637 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:53:01 -0600 Subject: fix sed syntax --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 4d52047..6c94294 100755 --- a/deploy.sh +++ b/deploy.sh @@ -41,7 +41,7 @@ cd "$HOME" ~/website/post-publish.sh sed -i 's/) .*/jjanzen@jjanzen.ca (jjanzen)/g' ~/public_html/rss.xml +sed -i 's/.*<\/webMaster>/jjanzen@jjanzen.ca (jjanzen)<\/webMaster>/g' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From 2140698d15c67d6e3ccc9fb3bf85bb9486fe899f Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 5 Jan 2025 19:55:16 -0600 Subject: fix author --- deploy.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 6c94294..e5fc4e2 100755 --- a/deploy.sh +++ b/deploy.sh @@ -42,6 +42,7 @@ cd "$HOME" sed -i 's/) .*<\/webMaster>/jjanzen@jjanzen.ca (jjanzen)<\/webMaster>/g' ~/public_html/rss.xml +sed -i 's/.*<\/author>/jjanzen@jjanzen.ca (jjanzen)<\/author>/g' ~/public_html/rss.xml /bin/cp -r "$HOME/public_html"/* "$location" chown -R apache:apache "$location" -- cgit v1.2.3 From b1d1155f4fc66d019bcde29e01c291180fb3b2df Mon Sep 17 00:00:00 2001 From: jjanzen Date: Sun, 5 Jan 2025 20:35:09 -0600 Subject: update branch --- deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index e5fc4e2..4c0e69e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -23,12 +23,12 @@ git clean -f git pull cd ~/dotfiles || exit -git checkout "$branch" +git checkout main git clean -f git pull cd ~/blog || exit -git checkout "$branch" +git checkout main git clean -f git pull @@ -36,7 +36,7 @@ git pull cd ~/dotfiles || exit ~/website/fix-dotfile-paths.sh -cd "$HOME" +cd "$HOME" || exit /usr/local/bin/emacs --batch -f package-initialize --script ~/website/publish.el ~/website/post-publish.sh -- cgit v1.2.3