From 962991843784f9bc92f4e97f22e07a67ac8c2ab8 Mon Sep 17 00:00:00 2001
From: Emuis <emuis@tfwno.gf>
Date: Wed, 14 Feb 2018 21:31:04 -0500
Subject: [PATCH] use the resources in the git repo, not whatever's outside
---
devTools/BuildAndIPFSify.sh | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/devTools/BuildAndIPFSify.sh b/devTools/BuildAndIPFSify.sh
index 838616030ab..337b3e429d5 100755
--- a/devTools/BuildAndIPFSify.sh
+++ b/devTools/BuildAndIPFSify.sh
@@ -37,13 +37,8 @@ sed -Ei -e '/^ \* Built on .+$/d' bin/*.html
# add the date of the last commit to the file, but don't use colons because Windows (still?) doesn't like them
mv bin/*.html "bin/FC pregmod $(git log -1 --format='%cd' --date='format:%F %H-%M').html"
-# add the vector art if it is available
-ipfs_hash="nothing"
-if [ -e ../resources ]; then
- ipfs_hash="$(ipfs add -w -Q -r bin/*.html ../resources)"
-else
- ipfs_hash="$(ipfs add -w -Q bin/*.html)"
-fi
+# include the unembedded vector art
+ipfs_hash="$(ipfs add -w -Q -r bin/*.html resources)"
echo "IPFS Folder Hash: ${ipfs_hash}" > ../IPFS_hash.txt
ipfs name publish "$ipfs_hash"
@@ -58,7 +53,7 @@ if [ -z "${XDG_RUNTIME_DIR+x}" ]; then
fi
# throw it into a file so we can loop over lines, not "strings delimited by whitespace"
-find ../resources/ bin -print | grep -ve '.gitignore' | sed -e 's|\.\./||' -e 's|bin/||' -e '/bin$/d' | grep -Ee '.+\.svg' -e '.html' > "${XDG_RUNTIME_DIR}/files.list"
+find resources bin -print | grep -ve '.gitignore' | sed -e 's|bin/||' | grep -Ee '.+\.svg' -e '.html' > "${XDG_RUNTIME_DIR}/files.list"
# ipfs PeerID, it's user specific
PeerID="$(ipfs config show | grep -e 'PeerID' | cut -d: -f 2 | tr -d ' "')"
--
GitLab