renamed cryptobox-data to cryptobox-misc (images and css)

cbox-tree.d/etc/cryptobox/cryptobox.conf

@@ -8,7 +8,7 @@ SCAN_DEVICES="hda hdb hdc hdd hde hdf hdg scd0 scd1 scd2 scd3 sg sda sdb sdc sdd
 
 # web interface
 HTML_TEMPLATE_DIR=/usr/share/cryptobox/templates
-STYLESHEET_URL=/cryptobox-data/cryptobox.css
+STYLESHEET_URL=/cryptobox-misc/cryptobox.css
 
 # directories
 LANGUAGE_DIR=/usr/share/cryptobox/lang

scripts/userdocexport.sh

@@ -35,7 +35,7 @@ LANGUAGES="de en"
 
 DEST_DIR="$ROOT_DIR/cbox-tree.d/usr/share/doc/cryptobox/html"
 OFFLINE_DIR="$ROOT_DIR/live-cd-tree.d/_offline/doc"
-IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-img"
+IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-misc"
 TMP_DIR=/tmp/$(basename $0)-$$.d
 
 HEADER_FILE=doc_header.inc
@@ -91,7 +91,7 @@ for LANG in $LANGUAGES; do
 		#wget --quiet --ignore-tags=a --no-clobber --page-requisites --convert-links --no-directories --base="$WIKI_HOST$WIKI_URL" --directory-prefix="$TMP_DIR" --html-extension --force-html --input-file="$TMP_FILE" || { echo "Downloading requisites for ($PAGE_SRC) failed!"; exit 1; }
 
 		echo "	adjusting links for images ..."
-		sed -i "s#='[^']*/cryptobox-img/\([^']*\)'#='/cryptobox-img/\1'#g" "$TMP_FILE"
+		sed -i "s#='[^']*/cryptobox-misc/\([^']*\)'#='/cryptobox-misc/\1'#g" "$TMP_FILE"
 
 		echo "	adjusting wiki links ..."
 		# redirect wiki links to cryptobox cgi
@@ -112,7 +112,7 @@ for LANG in $LANGUAGES; do
 		sed -i "s%=\"$CBOX_CGI\([^\"#]*\)%=\"\1.html%g" "$offline_file"
 		# do it twice - this should not be necessary
 		sed -i "s%=\"$CBOX_CGI\([^#\"]*\)%=\"\1.html%g" "$offline_file"
-		sed -i "s#='/cryptobox-img#='../../../var/www/cryptobox-img#g" "$offline_file"
+		sed -i "s#='/cryptobox-misc#='../../../var/www/cryptobox-misc#g" "$offline_file"
 
 		# split language specific part of moin link and replace it by current language
 		for TLANG in $LANGUAGES

scripts/validate.sh

@@ -86,18 +86,17 @@ function import_style()
 # get the stylesheet file and images
 # change the stylesheet link
 {
-	[ -d "$VALIDATE_REPORT_DIR/cryptobox-img" ] && rm -r "$VALIDATE_REPORT_DIR/cryptobox-img"
-	mkdir -p "$VALIDATE_REPORT_DIR/cryptobox-img"
-	[ -e "$VALIDATE_REPORT_DIR/cryptobox.css" ] && rm "$VALIDATE_REPORT_DIR/cryptobox.css"
-	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox.css" http://$VALIDATE_HOST_IP_DEFAULT/cryptobox.css
+	[ -d "$VALIDATE_REPORT_DIR/cryptobox-misc" ] && rm -r "$VALIDATE_REPORT_DIR/cryptobox-misc"
+	mkdir -p "$VALIDATE_REPORT_DIR/cryptobox-misc"
+	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-misc/cryptobox.css" http://$VALIDATE_HOST_IP_DEFAULT/cryptobox-misc/cryptobox.css
 	# extract image file names
-	grep "url(cryptobox-img/" "$VALIDATE_REPORT_DIR/cryptobox.css" | sed 's#^.*url(cryptobox-img/\(.*\)).*$#\1#' | while read a
-		do	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-img/$a" "http://$VALIDATE_HOST_IP_DEFAULT/cryptobox-img/$a"
+	grep "url(" "$VALIDATE_REPORT_DIR/cryptobox.css" | sed 's#^.*url(\(.*\)).*$#\1#' | while read a
+		do	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-misc/$a" "http://$VALIDATE_HOST_IP_DEFAULT/cryptobox-misc/$a"
 	  done
 	
 	# change the stylesheet link in every html file in REPORT_DIR
 	find "$VALIDATE_REPORT_DIR" -type f -name \*.html | while read a
-		do	sed -i '/stylesheet/s#href=\"/cryptobox.css\"#href=\"../cryptobox.css\"#g' "$a"
+		do	sed -i '/stylesheet/s#href=\"/cryptobox-misc/cryptobox.css\"#href=\"../cryptobox-misc/cryptobox.css\"#g' "$a"
 	  done
 }