Moved utils script to utils/ (instead of trunk)

fetch_doc.rb → pam_usb/utils/fetch_doc.rb

@@ -9,7 +9,7 @@
 require 'open-uri'
 
 BASE_URI = 'http://www.pamusb.org/wiki/doc/'
-DOC_PATH = './pam_usb/doc/'
+DOC_PATH = '../doc/'
 DOCS = [ 'installation', 'upgrading', 'configuration', 'faq' ]
 MANS = [ 'pusb_hotplug', 'pusb_conf', 'pusb_check' ]
 
@@ -50,6 +50,8 @@ def fetch_doc(name)
 	body
 end
 
+Dir.chdir(File.dirname($0))
+
 DOCS.each do |doc|
 	print "Fetching doc:#{doc}... "
 	STDOUT.flush

roll_release.sh → pam_usb/utils/roll_release.sh

@@ -6,7 +6,7 @@
 # and performs basic QA checks.
 #
 
-TRUNK_PATH="./pam_usb"
+TRUNK_PATH="../"
 
 clean_sources()
 {
@@ -37,7 +37,10 @@ create_release()
 	echo "* Rolling release $1 on $BUILD_ENV..."
 
 	cp -r $TRUNK_PATH ${SRC_PATH}
+
+	echo "* Cleaning up..."
 	find "$SRC_PATH" -type d -name ".svn" -exec rm -rf "{}" +
+	rm -rf $SRC_PATH/utils
 
 	echo "* Tagging release \"$1\""
 	sed -ri "s/(PUSB_VERSION) \"[^\"]*\"/\1 \"${1}\"/" ${SRC_PATH}/src/version.h
@@ -47,7 +50,7 @@ create_release()
 	tar -zcf $TARBALL pam_usb-${1}
 	cd - > /dev/null
 
-	cp -a $SRC_PATH ../tags/${1}
+	cp -a $SRC_PATH ${TRUNK_PATH}/../../tags/${1}
 	cp ${BUILD_ENV}/${TARBALL} .
 	rm -rf $BUILD_ENV