Fix extension symlinking at mediawiki-dl

diff --git a/mediawiki-dl b/mediawiki-dl
index d6e873ca7a1cd0370cf078369f61cd8dda4142f4..16384fb497207c866c9cb2263862612e5b742740 100755 (executable)
--- a/mediawiki-dl
+++ b/mediawiki-dl
@@ -29,7 +29,7 @@ function mediawiki_deploy {
   tar xvf $TARBALL
   $sudo chown -R root. mediawiki-$VERSION
   rm $TARBALL*
-  ln -sf mediawiki-$VERSION mediawiki
+  $sudo ln -sf mediawiki-$VERSION mediawiki
 }
 
 # Upgrade
@@ -48,16 +48,14 @@ function mediawiki_upgrade {
   # Copy configuration
   $sudo cp -a mediawiki-$OLD_VERSION/LocalSettings.php mediawiki-$VERSION/
 
-  # Symlink extensions
+  # Contrib extensions
   if [ -d "mediawiki-$OLD_VERSION/contrib" ]; then
     $sudo cp -a mediawiki-$OLD_VERSION/contrib mediawiki-$VERSION/
 
-    for extension in mediawiki-$VERSION/contrib/*; do
-      if [ -d "mediawiki-$VERSION/contrib/$extension" ]; then
-        (
-          cd mediawiki-$VERSION/extensions
-          $sudo ln -s ../contrib/$extension
-        )
+    # Symlink extensions
+    for extension in mediawiki-$OLD_VERSION/extensions/*; do
+      if [ -h "mediawiki-$OLD_VERSION/extensions/$extension" ]; then
+        $sudo cp mediawiki-$OLD_VERSION/extensions/$extension mediawiki-$VERSION/extensions/$extension
       fi
     done
   fi