fix article and script

This commit is contained in:
Yann Esposito (Yogsototh) 2021-06-01 18:26:04 +02:00
parent cbcff38c99
commit 2a6f814c6d
Signed by untrusted user who does not match committer: yogsototh
GPG Key ID: 7B19A4C650D59646
2 changed files with 9 additions and 4 deletions

View File

@ -20,9 +20,9 @@ handleShellFailed (ShellFailed cmdLine _) = do
echo $ ("[FAILED]: " <> unsafeTextToLine cmdLine)
setSGR [Reset]
handleProcFailed :: ProcFailed -> IO ()
handleProcFailed (ProcFailed procCommand procArgs _) = do
handleProcFailed (ProcFailed procCmd procArgs _) = do
setSGR [SetColor Foreground Dull Red]
echo $ unsafeTextToLine ("[FAILED]: " <> procCommand <> (mconcat procArgs))
echo $ unsafeTextToLine ("[FAILED]: " <> procCmd <> (mconcat procArgs))
setSGR [Reset]
@ -39,9 +39,10 @@ mainProc = do
debug $ unsafeTextToLine $ "cd " <> (format fp pubdir)
cd pubdir
pwd >>= echo . unsafeTextToLine . format fp
dshells "rm -rf .git"
dshells "git init ."
dshell ("git remote add upstream " <> mainRepository)
dshells "git fetch upstream"
dshells "git fetch --depth 1 upstream gh-pages"
dshells "git reset upstream/gh-pages"
dshells "git add -A ."
echo "Commit and publish"
@ -49,15 +50,18 @@ mainProc = do
echo "Don't `git push` this time"
dshells "git push -q upstream HEAD:gh-pages"
debug :: Line -> IO ()
debug txt = do
setSGR [SetColor Foreground Dull Yellow]
echo txt
setSGR [Reset]
dshells :: Text -> IO ()
dshells x = do
debug $ unsafeTextToLine x
shells x empty
dshell :: Text -> IO ExitCode
dshell x = do
debug $ unsafeTextToLine x
shell x empty
@ -69,6 +73,7 @@ checkDir = do
then exit (ExitFailure 1)
else return "_site"
mainRepository :: Text
mainRepository = "git@github.com:yogsototh/yannesposito.com.git"
cloneIfNeeded :: FilePath -> IO ()

View File

@ -7,7 +7,7 @@
#+description: The filmography is magistral, as well as the soundtrack,
#+description: acting, and overall atmosphere.
#+description: I really urge you to at least take a look at the opening scene.
#+keywords: blog static
#+keywords: tv-show
#+author: Yann Esposito
#+email: yann@esposito.host
#+date: [2021-06-01 Tue]