Merge branch 'master' of file:///srv/git/repoindex

Conflicts: index.php
author: Luke Shumaker <lukeshu@sbcglobal.net> 2014-12-04 00:25:57 +0000
committer: Luke Shumaker <lukeshu@sbcglobal.net> 2014-12-04 00:25:57 +0000
commit: def8b983ce1beb55826c9f591905b2da585c7548 (patch)
tree: 845b1cd058ef9471ce891f5ed7bd6ca803f298ec
parent: 260c20d47aad928550874d92599da4a05efcbb2f (diff)
parent: c396f214c89cdc287d39d76f0d060c81e5be1edd (diff)
16 files changed, 96 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index b25c15b..40cf349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,11 @@
+*.svg.png
 *~
+dir.png
+file.png
+iso.png
+parent.png
+pkg.png
+repo.png
+tar.png
+torrent.png
+txt.png
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..ee7d6a5
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..fb33286
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,55 @@
+## SVG2PNG: Each is buggy in their own way
+## Usage: $(call SVG2PNG,infile,outfile[,width,height,background-color])
+##
+## ImageMagick: doesn't support transparency
+#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $(if $5,-background $5) $2
+## librsvg: doesn't support <style> element
+#SVG2PNG = rsvg-convert $1 -o $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,--background-color=$5)
+## Inkscape: messes up gradients
+SVG2PNG = inkscape $1 --export-png $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,-b '$5')
+
+#PNGCRUSH = cp $1 $2
+PNGCRUSH = pngcrush $1 $2
+
+default: PHONY all
+
+
+
+dir.png     = /usr/share/icons/oxygen/16x16/mimetypes/inode-directory.png
+file.png    = /usr/share/icons/oxygen/16x16/mimetypes/unknown.png
+iso.png     = /usr/share/icons/oxygen/16x16/devices/media-optical.png
+parent.png  = /usr/share/icons/oxygen/16x16/actions/go-up.png
+pkg.png     = pkg.svg.png
+repo.png    = /usr/share/icons/oxygen/16x16/places/folder-tar.png
+tar.png     = tar.svg.png
+torrent.png = /usr/share/icons/oxygen/16x16/actions/download.png
+txt.png     = /usr/share/icons/oxygen/16x16/mimetypes/text-plain.png
+
+# TODO: get the Arch and Parabola icons
+
+# 'tar.svg' is derived from
+#   '/usr/share/icons/oxygen/scalable/places/small/16x16/folder-tar.svgz'
+
+# 'pkg.svg' is derived from 'tar.svg'
+
+
+
+pngs := $(shell sed -n 's/\.png\s*=.*/.png/p' $(MAKEFILE_LIST))
+$(foreach png,$(pngs),$(eval $(png): $($(png)); $$(call PNGCRUSH,$$<,$$@)))
+
+all: PHONY $(pngs) .gitignore
+clean: PHONY
+	rm -f -- *.svg.png
+distclean: PHONY clean
+	rm -f -- $(pngs)
+
+.gitignore: $(MAKEFILE_LIST)
+	printf '%s\n' '*~' '*.svg.png' $(pngs) | LC_COLLATE=C sort > .gitignore
+
+%.svg.png: %.svg
+	$(call SVG2PNG,$<,$@,16)
+
+
+
+.PHONY: PHONY
+.DELETE_ON_ERROR:
diff --git a/dir.png b/dir.png
deleted file mode 100644
index 3da2ca9..0000000
--- a/dir.png
+++ /dev/null
diff --git a/file.png b/file.png
deleted file mode 100644
index 222832a..0000000
--- a/file.png
+++ /dev/null
diff --git a/index.php b/index.php
index 2c06ca3..5c0c53b 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,9 @@
 <?php
+# Copyright © 2014 Luke Shumaker <lukeshu@sbcglobal.net>
+# This work is free. You can redistribute it and/or modify it under the
+# terms of the Do What The Fuck You Want To Public License, Version 2,
+# as published by Sam Hocevar. See the ./COPYING file for more details.
+
 // Configuration
 $repos_arch_project = [ 'core', 'extra', 'staging', 'testing', 'gnome-unstable', 'kde-unstable' ];
 $repos_arch_community = [ 'community', 'community-staging', 'community-testing',
@@ -96,7 +101,6 @@ if (!is_dir($root.'/'.$dirname)) {
 <head>
 	<meta charset="utf-8" />
 	<title>Parabola GNU/Linux-libre - Index of <?php echo htmlentities($dirname); ?></title>
-	<link rel="stylesheet" type="text/css" href="https://parabolagnulinux.org/static/archweb.3b36d2301f70.css" media="screen, projection" />
 	<link rel="stylesheet" type="text/css" href="<?php echo $assetdir."/style.css"; ?>" />
 	<link rel="icon" type="image/x-icon" href="https://parabolagnulinux.org/static/favicon.72ab042ac877.ico" />
 	<link rel="shortcut icon" type="image/x-icon" href="https://parabolagnulinux.org/static/favicon.72ab042ac877.ico" />
diff --git a/iso.png b/iso.png
deleted file mode 100644
index 612fc81..0000000
--- a/iso.png
+++ /dev/null
diff --git a/parent.png b/parent.png
deleted file mode 100644
index b3d9cef..0000000
--- a/parent.png
+++ /dev/null
diff --git a/pkg.png b/pkg.png
deleted file mode 100644
index ef02804..0000000
--- a/pkg.png
+++ /dev/null
diff --git a/pkg.svg b/pkg.svg
index 6adbea2..603c667 100644
--- a/pkg.svg
+++ b/pkg.svg
@@ -16,9 +16,9 @@
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
    version="1.0"
-   sodipodi:docname="folder-tar.svg"
+   sodipodi:docname="pkg.svg"
    inkscape:output_extension="org.inkscape.output.svgz.inkscape"
-   inkscape:export-filename="/home/luke/icons/folder-tar.png"
+   inkscape:export-filename="pkg.svg.png"
    inkscape:export-xdpi="11.25"
    inkscape:export-ydpi="11.25">
   <defs
diff --git a/repo.png b/repo.png
deleted file mode 100644
index 5d0412f..0000000
--- a/repo.png
+++ /dev/null
diff --git a/style.css b/style.css
index 572a8fb..c117754 100644
--- a/style.css
+++ b/style.css
@@ -1,3 +1,11 @@
+/* Copyright © 2014 Luke Shumaker <lukeshu@sbcglobal.net>
+ * This work is free. You can redistribute it and/or modify it under the
+ * terms of the Do What The Fuck You Want To Public License, Version 2,
+ * as published by Sam Hocevar. See the ./COPYING file for more details.
+ */
+
+@import url('https://www.parabola.nu/static/archweb.css');
+
 /* generic */
 
 td {
diff --git a/tar.png b/tar.png
deleted file mode 100644
index e1634bd..0000000
--- a/tar.png
+++ /dev/null
diff --git a/tar.svg b/tar.svg
index 5fde86e..29f83b0 100644
--- a/tar.svg
+++ b/tar.svg
@@ -16,9 +16,9 @@
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
    version="1.0"
-   sodipodi:docname="pkg.svg"
+   sodipodi:docname="tar.svg"
    inkscape:output_extension="org.inkscape.output.svgz.inkscape"
-   inkscape:export-filename="/home/luke/icons/folder-tar.png"
+   inkscape:export-filename="tar.svg.png"
    inkscape:export-xdpi="11.25"
    inkscape:export-ydpi="11.25">
   <defs
diff --git a/torrent.png b/torrent.png
deleted file mode 100644
index 7165d1b..0000000
--- a/torrent.png
+++ /dev/null
diff --git a/txt.png b/txt.png
deleted file mode 100644
index 01b07e8..0000000
--- a/txt.png
+++ /dev/null
author	Luke Shumaker <lukeshu@sbcglobal.net>	2014-12-04 00:25:57 +0000
committer	Luke Shumaker <lukeshu@sbcglobal.net>	2014-12-04 00:25:57 +0000
commit	def8b983ce1beb55826c9f591905b2da585c7548 (patch)
tree	845b1cd058ef9471ce891f5ed7bd6ca803f298ec
parent	260c20d47aad928550874d92599da4a05efcbb2f (diff)
parent	c396f214c89cdc287d39d76f0d060c81e5be1edd (diff)