From 80a0cae5b36ed603259c17319a82910fc7637175 Mon Sep 17 00:00:00 2001 From: Brian (bex) Exelbierd Date: Oct 20 2017 14:56:52 +0000 Subject: Updating builder.sh to build council-docs and fix links in index.html --- diff --git a/_distro_map.yml b/_distro_map.yml index d795d3d..ecb4937 100644 --- a/_distro_map.yml +++ b/_distro_map.yml @@ -18,3 +18,6 @@ fedora: fedora-budget: name: Fedora Budget dir: fedora-budget + Fedora-Council_council-docs: + name: Fedora Project + dir: fedora-project diff --git a/builder.sh b/builder.sh index f5334f0..9462a3e 100755 --- a/builder.sh +++ b/builder.sh @@ -29,7 +29,7 @@ release-notes" # Nonbooks # Note: Does not support preprocessors, such as the one used by fedora-budget # You must manually update _distro_map.yml and index-main.html -NONBOOKS="" +NONBOOKS="Fedora-Council/council-docs" DATE=`date` @@ -73,18 +73,19 @@ done # Build out non-BOOKS all on master-en-US for nonbook in $NONBOOKS; do git checkout master - git branch -D $nonbook + nonbookdir=`echo $nonbook | sed 's/\//_/g'` + git branch -D $nonbookdir # We need a clean branch for these - git checkout -b $nonbook + git checkout -b $nonbookdir git rm -rf . git add . git commit -m "Cleared branch $nonbook on $DATE" branch=master # Book Source into _git - git subtree add --prefix _git/$nonbook https://pagure.io/$nonbook.git $branch --squash + git subtree add --prefix _git/$nonbookdir https://pagure.io/$nonbook.git $branch --squash cd _git - stow $nonbook + stow $nonbookdir cd .. # Commit it all baby - Nonbooks diff --git a/index-main.html b/index-main.html index 713f7a5..5374503 100644 --- a/index-main.html +++ b/index-main.html @@ -59,11 +59,11 @@
Fedora Project and Community Information
- -  Fedora Wiki + +  Mission and Organization -  Fedora Budget +  Budget