From 5746d244d75fc52efd34d9139f3371e922c102e4 Mon Sep 17 00:00:00 2001 From: Wouter R Date: Sat, 27 Jul 2013 02:39:45 +0200 Subject: [PATCH] Repository cleanup. --- .gitignore | 1 - README | 4 +++ extra/compare-backup.sh | 10 ------- extra/openwrt-supplement-files/root/.profile | 2 ++ extra/print-gcode.html | 14 ++++++++++ .../create-packages-feed-dir.sh} | 4 +-- extra/scripts/recreate-Sites-packagedir.sh | 8 ++++++ extra/wifibox-restore-files/etc/banner | 15 ---------- .../wifibox-restore-files/etc/sysupgrade.conf | 11 -------- extra/wifibox-restore-files/root/.profile | 2 -- src/README | 28 ------------------- 11 files changed, 30 insertions(+), 69 deletions(-) create mode 100644 README delete mode 100755 extra/compare-backup.sh create mode 100644 extra/openwrt-supplement-files/root/.profile create mode 100644 extra/print-gcode.html rename extra/{create-packages-dir.sh => scripts/create-packages-feed-dir.sh} (83%) create mode 100755 extra/scripts/recreate-Sites-packagedir.sh delete mode 100644 extra/wifibox-restore-files/etc/banner delete mode 100644 extra/wifibox-restore-files/etc/sysupgrade.conf delete mode 100644 extra/wifibox-restore-files/root/.profile delete mode 100644 src/README diff --git a/.gitignore b/.gitignore index ce2a350..b8752e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -extra/backup misc diff --git a/README b/README new file mode 100644 index 0000000..3e7086a --- /dev/null +++ b/README @@ -0,0 +1,4 @@ +WiFi box OpenWRT firmware package +================================= + +Documentation can be found in the source code and on the wiki: . diff --git a/extra/compare-backup.sh b/extra/compare-backup.sh deleted file mode 100755 index f5bc515..0000000 --- a/extra/compare-backup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -BACKUP_BASENAME=d3d-wifibox-backup -BACKUP_FILE=$BACKUP_BASENAME.tar.gz -REPO_PATH=../../src -BKP_PATH=$BACKUP_BASENAME/lua/autowifi - -cd backup -tar xzvf $BACKUP_FILE -opendiff $REPO_PATH $BKP_PATH diff --git a/extra/openwrt-supplement-files/root/.profile b/extra/openwrt-supplement-files/root/.profile new file mode 100644 index 0000000..e59834d --- /dev/null +++ b/extra/openwrt-supplement-files/root/.profile @@ -0,0 +1,2 @@ +alias d='ls -la --color=auto' +alias wopkg='/usr/share/lua/wifibox/opkg.conf' diff --git a/extra/print-gcode.html b/extra/print-gcode.html new file mode 100644 index 0000000..669d646 --- /dev/null +++ b/extra/print-gcode.html @@ -0,0 +1,14 @@ + + + . + + +
+ + + + + +
+ + diff --git a/extra/create-packages-dir.sh b/extra/scripts/create-packages-feed-dir.sh similarity index 83% rename from extra/create-packages-dir.sh rename to extra/scripts/create-packages-feed-dir.sh index 0ae04ee..dc69d95 100755 --- a/extra/create-packages-dir.sh +++ b/extra/scripts/create-packages-feed-dir.sh @@ -8,8 +8,8 @@ INDEX_FILE=Packages INDEX_GZ_FILE=Packages.gz if [ "x$1" == "x-h" ]; then - echo "This script creates a directory with wifibox and ultifi ipk files found in the openWrt build environment." - echo "If specified, the -z option also compresses the result." + echo "This script creates a directory with wifibox and ultifi ipk files found in the openWrt build environment. The feed dir is called $PKG_DEST_DIR and will be created in the current directory. (currently `pwd`)" + echo "If specified, the -z option also compresses the result for easier transfer to a webserver." exit fi diff --git a/extra/scripts/recreate-Sites-packagedir.sh b/extra/scripts/recreate-Sites-packagedir.sh new file mode 100755 index 0000000..b131763 --- /dev/null +++ b/extra/scripts/recreate-Sites-packagedir.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# This script is merely for conveniently generating the packages feed directory in ~/Sites (e.g. for use with XAMPP or the like). Modify WIFIBOX_BASE_DIR to point to your wifibox directory tree. + +WIFIBOX_BASE_DIR=~/Files/_devel/eclipse-workspace/wifibox + +cd ~/Sites +$WIFIBOX_BASE_DIR/extra/scripts/create-packages-feed-dir.sh diff --git a/extra/wifibox-restore-files/etc/banner b/extra/wifibox-restore-files/etc/banner deleted file mode 100644 index e5fe643..0000000 --- a/extra/wifibox-restore-files/etc/banner +++ /dev/null @@ -1,15 +0,0 @@ - _______ ________ __ - | |.-----.-----.-----.| | | |.----.| |_ - | - || _ | -__| || | | || _|| _| - |_______|| __|_____|__|__||________||__| |____| - |__| W I R E L E S S F R E E D O M - ----------------------------------------------------- - BARRIER BREAKER (Bleeding Edge, r36032) - ----------------------------------------------------- - * 1/2 oz Galliano Pour all ingredients into - * 4 oz cold Coffee an irish coffee mug filled - * 1 1/2 oz Dark Rum with crushed ice. Stir. - * 2 tsp. Creme de Cacao - ----------------------------------------------------- - - d3d-wifi test box #2 diff --git a/extra/wifibox-restore-files/etc/sysupgrade.conf b/extra/wifibox-restore-files/etc/sysupgrade.conf deleted file mode 100644 index 986f04b..0000000 --- a/extra/wifibox-restore-files/etc/sysupgrade.conf +++ /dev/null @@ -1,11 +0,0 @@ -## This file contains files and directories that should -## be preserved during an upgrade. - -# /etc/example.conf -# /etc/openvpn/ - -/etc -/usr/share/lua/autowifi -/www/admin -/www/cgi-bin/wfcf -/root diff --git a/extra/wifibox-restore-files/root/.profile b/extra/wifibox-restore-files/root/.profile deleted file mode 100644 index 35a9012..0000000 --- a/extra/wifibox-restore-files/root/.profile +++ /dev/null @@ -1,2 +0,0 @@ -alias d='ls -la --color=auto' -alias wfcfr='/usr/share/lua/autowifi/ext/wfcf' diff --git a/src/README b/src/README deleted file mode 100644 index 2861065..0000000 --- a/src/README +++ /dev/null @@ -1,28 +0,0 @@ -NOTE: text below is otudated, take it with a grain of salt. ------ - -Installation: -- make sure radio0 in /etc/config/wireless is not disabled -- the wlan net must also be added to firewall in the lan zone - -== these steps are performed by the package installer -- (ignore) place the src directory in /usr/share/lua and name it 'autowifi' -- (ignore) create a symlink to ext/wfcf in /www/cgi-bin (make sure the file is executable) -- (ignore) create a symlink to admin in /www -- (ignore) create a symlink to ext/autowifi_init in /etc/rc.d and name it S18autowifi_init - -== these two items are now handled by the script -- create a wlan network in /etc/config/network as follows <