Merge branch 'upstream' into debian/sid

1 files changed, 6 insertions, 13 deletions

diff --git a/Rantfile b/Rantfile
index 04063df5..f46c89ec 100644
--- a/Rantfile
+++ b/Rantfile
@@ -189,7 +189,7 @@ task :default => [:default_notice,:project]
 desc "Setup/Install #{@proj[:name]} and try generate a file"
 task :project=> [:setup_bin,:setup_lib,:setup_conf,:setup_share,:setup_data,:setup_man,:setup_vim,:post_install_note]
 desc "Setup/Install #{@proj[:name]}"
-task :setup=> [:setup_bin, :setup_lib,:setup_conf,:setup_share,:setup_data,:post_install] #, :help]
+task :setup=> [:setup_bin, :setup_lib,:setup_conf,:setup_share,:setup_data] #, :help]
 desc "Setup/Install #{@proj[:name]}: bin, lib and conf (no data)"
 task :setup_base=> [:setup_bin,:setup_lib,:setup_conf,:setup_share,:setup_man,:setup_vim]
 desc "Setup/Install #{@proj[:name]} bin, lib and conf (no data and no attempt to do postinstall setup)"
@@ -290,8 +290,6 @@ if File.directory?('man')                                    #man
 end
 desc "Setup Note"
 task :setup_note => [:help]
-desc "Note on post installation"                      #remove conf
-task :post_install_note => [:post_install_note]
 desc "System information used by #{@proj[:name]}"
 task :system => [:system_info,:project_help,:post_install_note]
 desc "show all system info available - parameters found"
@@ -307,24 +305,19 @@ task :create_rant_independent_task_file => [:rant_independence]
 task :rant_independence do                                 #notice
   resp=''
   while resp.length < 4
-    resp='install'                                     #default name install
+    resp='sisu-install'                                     #default name install
     print %{#{@proj[:rant]}
   Create a rant dependency independent file
   provide filename default name is "install"
     [Warning, will overwrite file of name provided
       provide name or "quit" to exit]: }
-    #res=File.new('/dev/tty').gets.strip
-    #resp=res if res =~/\S{4,30}/
     exit if resp =~/^(?:n|quit|exit)$/
   end
   remove='y' #remove='n'
-  #remove=if FileTest.file?(resp)
-  #  print "a file of the same name #{resp} exists, [y] to replace: "
-  #  File.new('/dev/tty').gets.strip
-  #else 'y'
-  #end
- if remove =~/y/; system("rant-import --force --auto #{resp}\n")
-   #puts "#{resp} updated"
+ if remove =~/y/
+   system("rant-import --force --auto #{resp};
+     chmod 755 #{resp}
+   ")
  else #puts "#{resp} not replaced"
  end
 end