* [PATCH 1/3] Makefile-web: Download prettify from git
@ 2015-12-09 1:17 Joel Stanley
2015-12-09 1:17 ` [PATCH 2/3] web/logo: Use a relative protocol Joel Stanley
2015-12-09 1:17 ` [PATCH 3/3] Makefile-web: Quote the names in the error message Joel Stanley
0 siblings, 2 replies; 4+ messages in thread
From: Joel Stanley @ 2015-12-09 1:17 UTC (permalink / raw)
To: ccan
The SVN mirror disappeared some time ago. It now lives on Github.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
Makefile-web | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile-web b/Makefile-web
index a84b95902034..3b9f11124824 100644
--- a/Makefile-web
+++ b/Makefile-web
@@ -29,7 +29,7 @@ $(WEB_SUBDIRS): $(WEBDIR)
mkdir -p $@
$(PRETTIFY):
- svn checkout http://google-code-prettify.googlecode.com/svn/trunk/ $(WEBDIR)/prettify
+ git clone --depth=1 https://github.com/google/code-prettify.git $(WEBDIR)/prettify
$(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode
git ls-files -z $< | xargs -0 -x tar cvfj $@
--
2.6.2
_______________________________________________
ccan mailing list
ccan@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/ccan
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] web/logo: Use a relative protocol
2015-12-09 1:17 [PATCH 1/3] Makefile-web: Download prettify from git Joel Stanley
@ 2015-12-09 1:17 ` Joel Stanley
2015-12-09 1:17 ` [PATCH 3/3] Makefile-web: Quote the names in the error message Joel Stanley
1 sibling, 0 replies; 4+ messages in thread
From: Joel Stanley @ 2015-12-09 1:17 UTC (permalink / raw)
To: ccan
The webfont forces http, which results in a mixed content warning if
you're visiting the site on https. Strip the protocol so we use whatever
the user has connected with.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
web/logo.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/logo.html b/web/logo.html
index d281df9fc24d..c0d1531b32cb 100644
--- a/web/logo.html
+++ b/web/logo.html
@@ -9,7 +9,7 @@ $url_prefix = getenv("URLPREFIX");
<title>ccan</title>
<link rel="stylesheet" type="text/css" href="<?=$url_prefix?>ccan.css"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link href='http://fonts.googleapis.com/css?family=Raleway:300' rel='stylesheet' type='text/css'>
+ <link href='//fonts.googleapis.com/css?family=Raleway:300' rel='stylesheet' type='text/css'>
<link href='<?=$url_prefix?>prettify/src/prettify.css' rel='stylesheet' type='text/css'>
<script type="text/javascript" src="<?=$url_prefix?>prettify/src/run_prettify.js"></script>
<head>
--
2.6.2
_______________________________________________
ccan mailing list
ccan@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/ccan
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] Makefile-web: Quote the names in the error message
2015-12-09 1:17 [PATCH 1/3] Makefile-web: Download prettify from git Joel Stanley
2015-12-09 1:17 ` [PATCH 2/3] web/logo: Use a relative protocol Joel Stanley
@ 2015-12-09 1:17 ` Joel Stanley
2015-12-09 3:06 ` Rusty Russell
1 sibling, 1 reply; 4+ messages in thread
From: Joel Stanley @ 2015-12-09 1:17 UTC (permalink / raw)
To: ccan
progress found but fubar in MOD
is now:
'progress' found but 'fubar' in MOD
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
Makefile-web | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile-web b/Makefile-web
index 3b9f11124824..a7f92970de19 100644
--- a/Makefile-web
+++ b/Makefile-web
@@ -15,7 +15,7 @@ upload: fastcheck modcheck
# Check MODS list in Makefile-ccan matches modules we find.
modcheck:
- @FOUND=$$(echo $$(find ccan -name _info | sed 's,ccan/\(.*\)/_info,\1,' | sort) ); LISTED=$$(echo $$(echo $(MODS) | tr ' ' '\012' | sort) ); if [ "$$FOUND" = "$$LISTED" ]; then exit 0; fi; while true; do a="$${FOUND%% *}"; b="$${LISTED%% *}"; if [ "$$a" != "$$b" ]; then echo "$$a found but $$b in MOD" >&2; exit 1; fi; FOUND="$${FOUND#* }"; LISTED="$${LISTED#* }"; done
+ @FOUND=$$(echo $$(find ccan -name _info | sed 's,ccan/\(.*\)/_info,\1,' | sort) ); LISTED=$$(echo $$(echo $(MODS) | tr ' ' '\012' | sort) ); if [ "$$FOUND" = "$$LISTED" ]; then exit 0; fi; while true; do a="$${FOUND%% *}"; b="$${LISTED%% *}"; if [ "$$a" != "$$b" ]; then echo "'$$a' found but '$$b' in MOD" >&2; exit 1; fi; FOUND="$${FOUND#* }"; LISTED="$${LISTED#* }"; done
clean-tree:
[ "$(WEBDEV)" ] || ! git status --porcelain | grep .
--
2.6.2
_______________________________________________
ccan mailing list
ccan@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/ccan
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] Makefile-web: Quote the names in the error message
2015-12-09 1:17 ` [PATCH 3/3] Makefile-web: Quote the names in the error message Joel Stanley
@ 2015-12-09 3:06 ` Rusty Russell
0 siblings, 0 replies; 4+ messages in thread
From: Rusty Russell @ 2015-12-09 3:06 UTC (permalink / raw)
To: Joel Stanley, ccan
Joel Stanley <joel@jms.id.au> writes:
> progress found but fubar in MOD
>
> is now:
>
> 'progress' found but 'fubar' in MOD
All applied!
Thanks,
Rusty.
_______________________________________________
ccan mailing list
ccan@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/ccan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-09 3:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 1:17 [PATCH 1/3] Makefile-web: Download prettify from git Joel Stanley
2015-12-09 1:17 ` [PATCH 2/3] web/logo: Use a relative protocol Joel Stanley
2015-12-09 1:17 ` [PATCH 3/3] Makefile-web: Quote the names in the error message Joel Stanley
2015-12-09 3:06 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox