Fix unpacking of official distribution

Archive and top level directory has been renamed "sonarqube" in version 4.0.
Godin · Aug 30, 2015 · 81d37a5 · 81d37a5
1 parent 937f8ad
commit 81d37a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build-deb.sh b/build-deb.sh
@@ -15,7 +15,7 @@ VER=$1
 
 echo "Building DEB package"
 rm -v deb/*.zip || true
-cp /usr/distfiles/sonar-${VER}.zip deb/
+cp /usr/distfiles/sonarqube-${VER}.zip deb/
 cd deb/
 ./build.sh ${VER}
 cd ..

diff --git a/build-rpm.sh b/build-rpm.sh
@@ -14,7 +14,7 @@ VER=$1
 
 echo "Building RPM package"
 rm -v rpm/SOURCES/*.zip || true
-cp -v /usr/distfiles/sonar-${VER}.zip rpm/SOURCES/
+cp -v /usr/distfiles/sonarqube-${VER}.zip rpm/SOURCES/
 rpm/build.sh ${VER}
 
 echo "Building RPM repository"

diff --git a/deb/build.sh b/deb/build.sh
@@ -28,8 +28,8 @@ echo "sonar (${VER}) unstable; urgency=low
 " > debian/changelog
 
 # prepare sonar
-unzip sonar-${VER}.zip -d tmp/opt/
-mv tmp/opt/sonar-${VER}/ tmp/opt/sonar/
+unzip sonarqube-${VER}.zip -d tmp/opt/
+mv tmp/opt/sonarqube-${VER}/ tmp/opt/sonar/
 
 # Remove unnecessary files
 rm -rv tmp/opt/sonar/bin/windows*

diff --git a/rpm/SPECS/sonar.spec b/rpm/SPECS/sonar.spec
@@ -14,7 +14,7 @@ Packager:	Evgeny Mandrikov <mandrikov@gmail.com>
 Group:		Development/Tools
 License:	LGPLv3
 URL:		http://sonarsource.org/
-Source:		sonar-%{ver}.zip
+Source:		sonarqube-%{ver}.zip
 Source1:	sonar.init.in
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +29,7 @@ Sonar is an open source software quality management tool, dedicated
 to continuously analyze and measure source code quality.
 
 %prep
-%setup -q
+%setup -q -n sonarqube-%{ver}
 
 %build
 
@@ -50,7 +50,7 @@ for i in conf/* ; do
 done
 
 mkdir -p %{buildroot}/opt/sonar/
-cp -R %{_builddir}/sonar-%{ver}/* %{buildroot}/opt/sonar/
+cp -R %{_builddir}/sonarqube-%{ver}/* %{buildroot}/opt/sonar/
 
 %__install -D -m0755 "%{SOURCE1}" "%{buildroot}/etc/init.d/%{name}"