From ad770bea6789a14dbad6178d3c5e39775d1e5d55 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 19 Apr 2014 15:16:22 +0200
Subject: [PATCH] chromium: Move update.sh back into the main path.

This is to ensure that nothing unexpected will be after the merge of the
refactoring branch, and also my own autoupdate machinery is expecting
this location, so there really is no reason to change it now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/sources.nix           | 2 +-
 .../networking/browsers/chromium/{source => }/update.sh       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/applications/networking/browsers/chromium/{source => }/update.sh (95%)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 9204c7f08e5..6881b8d44e8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,4 +1,4 @@
-# This file is autogenerated from update.sh in the same directory.
+# This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
     version = "36.0.1941.0";
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
similarity index 95%
rename from pkgs/applications/networking/browsers/chromium/source/update.sh
rename to pkgs/applications/networking/browsers/chromium/update.sh
index 806169f524c..e82d22f34fd 100755
--- a/pkgs/applications/networking/browsers/chromium/source/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -3,7 +3,7 @@
 channels_url="http://omahaproxy.appspot.com/all?csv=1";
 history_url="http://omahaproxy.appspot.com/history";
 bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
-base_path="$(cd "$(dirname "$0")" && pwd)";
+base_path="$(cd "$(dirname "$0")" && pwd)/source";
 
 source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)";
 
@@ -116,7 +116,7 @@ versions="$(echo "$omaha" | sed -nr -e 's/^linux,([^,]+,[^,]+).*$/\1/p')";
 channel_exprs="$(get_channel_exprs "$versions")";
 
 cat > "$base_path/sources.nix" <<-EOF
-# This file is autogenerated from update.sh in the same directory.
+# This file is autogenerated from update.sh in the parent directory.
 {
 $channel_exprs
 }