Move from script to bin directory.

10 files changed, 15 insertions, 21 deletions

diff --git a/README.md b/README.md
index 283336b9e4d..256f640454e 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
 or start each component separately
 
     bundle exec rails s
-    script/background_jobs start
+    bin/background_jobs start
 
 And surf to [localhost:3000](http://localhost:3000/) and login with root / 5iveL!fe
 
diff --git a/script/background_jobs b/bin/background_jobs
index e0140e9689b..e0140e9689b 100755
--- a/script/background_jobs
+++ b/bin/background_jobs
diff --git a/script/check b/bin/check
index c907a98b5d9..c907a98b5d9 100755
--- a/script/check
+++ b/bin/check
diff --git a/script/upgrade.rb b/bin/upgrade.rb
index a5caecf8526..a5caecf8526 100644
--- a/script/upgrade.rb
+++ b/bin/upgrade.rb
diff --git a/script/web b/bin/web
index 1ad3b5d24b9..1ad3b5d24b9 100755
--- a/script/web
+++ b/bin/web
diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index 72a94f67b3c..d08c8b85b5f 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -19,10 +19,10 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
 ### 2. Run gitlab upgrade tool
 
     cd /home/git/gitlab
-    sudo -u git -H ruby script/upgrade.rb
+    sudo -u git -H ruby bin/upgrade.rb
 
     # to perform a non-interactive install (no user input required) you can add -y
-    # sudo -u git -H ruby script/upgrade.rb -y
+    # sudo -u git -H ruby bin/upgrade.rb -y
 
 ### 3. Start application
 
@@ -48,6 +48,6 @@ You've read through the entire guide, and probably did all the steps manually. H
 
 ```bash
 cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \
-  sudo service gitlab stop; sudo -u git -H ruby script/upgrade.rb -y; sudo service gitlab start; \
+  sudo service gitlab stop; sudo -u git -H ruby bin/upgrade.rb -y; sudo service gitlab start; \
   sudo service nginx restart; sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
 ```
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 3dd4465a6d8..5c1ce2dadab 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -167,14 +167,14 @@ start_gitlab() {
     # Remove old socket if it exists
     rm -f "$socket_path"/gitlab.socket 2>/dev/null
     # Start the web server
-    RAILS_ENV=$RAILS_ENV script/web start
+    RAILS_ENV=$RAILS_ENV bin/web start
   fi
 
   # If sidekiq is already running, don't start it again.
   if [ "$sidekiq_status" = "0" ]; then
     echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting"
   else
-    RAILS_ENV=$RAILS_ENV script/background_jobs start &
+    RAILS_ENV=$RAILS_ENV bin/background_jobs start &
   fi
 
   # Wait for the pids to be planted
@@ -197,11 +197,11 @@ stop_gitlab() {
 
   # If the Unicorn web server is running, tell it to stop;
   if [ "$web_status" = "0" ]; then
-     RAILS_ENV=$RAILS_ENV script/web stop
+     RAILS_ENV=$RAILS_ENV bin/web stop
   fi
   # And do the same thing for the Sidekiq.
   if [ "$sidekiq_status" = "0" ]; then
-    RAILS_ENV=$RAILS_ENV script/background_jobs stop
+    RAILS_ENV=$RAILS_ENV bin/background_jobs stop
   fi
 
   # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
@@ -253,10 +253,10 @@ reload_gitlab(){
     exit 1
   fi
   printf "Reloading GitLab Unicorn configuration... "
-  RAILS_ENV=$RAILS_ENV script/web reload
+  RAILS_ENV=$RAILS_ENV bin/web reload
   echo "Done."
   echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
-  RAILS_ENV=$RAILS_ENV script/background_jobs restart
+  RAILS_ENV=$RAILS_ENV bin/background_jobs restart
 
   wait_for_pids
   print_status
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 0387795fa48..ad5e04ecab9 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -637,7 +637,7 @@ namespace :gitlab do
       else
         puts "no".red
         try_fixing_it(
-          sudo_gitlab("RAILS_ENV=production script/background_jobs start")
+          sudo_gitlab("RAILS_ENV=production bin/background_jobs start")
         )
         for_more_information(
           see_installation_guide_section("Install Init Script"),
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake
index ba806e53ccf..e4bd6545755 100644
--- a/lib/tasks/sidekiq.rake
+++ b/lib/tasks/sidekiq.rake
@@ -1,21 +1,21 @@
 namespace :sidekiq do
   desc "GITLAB | Stop sidekiq"
   task :stop do
-    system *%W(script/background_jobs stop)
+    system *%W(bin/background_jobs stop)
   end
 
   desc "GITLAB | Start sidekiq"
   task :start do
-    system *%W(script/background_jobs start)
+    system *%W(bin/background_jobs start)
   end
 
   desc 'GitLab | Restart sidekiq'
   task :restart do
-    system *%W(script/background_jobs restart)
+    system *%W(bin/background_jobs restart)
   end
 
   desc "GITLAB | Start sidekiq with launchd on Mac OS X"
   task :launchd do
-    system *%W(script/background_jobs start_no_deamonize)
+    system *%W(bin/background_jobs start_no_deamonize)
   end
 end
diff --git a/script/rails b/script/rails
deleted file mode 100755
index f8da2cffd4d..00000000000
--- a/script/rails
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'