soks-create-wiki.rb in Soks-0.0.5

- old
+ new

@@ -36,15 +36,24 @@
 	while File.exists?(backup_dir); backup_dir.succ!; end
 	FileUtils.mv(directory, backup_dir)
 	backup_dir
 end
 
+# Used to remove the content of a directory (FileUtils.rm_r seems to fail for me?)
+def remove_directory( directory )
+	Dir.entries(directory).each do |file|
+		next if File.directory?( file )
+		File.delete( File.join( directory, file ) )
+	end
+	Dir.rmdir( directory )
+end
+
 #Find where we are
 $SOKS_APPLICATION_DIRECTORY, this_script =  File.split(File.expand_path(File.dirname(__FILE__)))
 
 #Make sure we can find our libraries
-soks_library = [ File.join( $SOKS_APPLICATION_DIRECTORY,'lib') , File.join( $SOKS_APPLICATION_DIRECTORY,'/contrib' ) ]
+soks_library = [ File.join( $SOKS_APPLICATION_DIRECTORY,'lib') , File.join( $SOKS_APPLICATION_DIRECTORY,'lib','helpers'), File.join( $SOKS_APPLICATION_DIRECTORY,'/contrib' ) ]
 $:.push( *soks_library )
 
 require 'easyprompt'
 
 #Default options
@@ -112,10 +121,10 @@
 		
 		copy_template( source, destination )
 		puts "Copied #{source} to #{destination}"
 		
 		if keep_content
-			FileUtils.rm_rf( File.join( destination, 'content' ) )
+			remove_directory( File.join( destination, 'content' ) )
 			FileUtils.cp_r( File.join( old_wiki, 'content'), destination )
 			puts "Copied content from #{old_wiki} to #{destination}"
 			if wiki_version == '0.0.2'
 				require 'soks-upgrade-0.0.2'
 				SoksUpgrade.new.upgrade_revisions( destination )
\ No newline at end of file