Merge pull request #5392 from eestrada/rpmbuild

Make atom.spec.in actually use grunt variables

resources/linux/atom.desktop.in

@@ -2,7 +2,7 @@
 Name=Atom
 Comment=<%= description %>
 GenericName=Text Editor
-Exec=<%= installDir %>/share/atom/atom %U
+Exec=atom %U
 Icon=<%= iconName %>
 Type=Application
 StartupNotify=true

resources/linux/redhat/atom.spec.in

@@ -1,27 +1,27 @@
 Name:           <%= name %>
 Version:        <%= version %>
 Release:        0.1%{?dist}
-Summary:        Atom is a hackable text editor for the 21st century
+Summary:        <%= description %>
 License:        MIT
 URL:            https://atom.io/
 AutoReqProv:    no # Avoid libchromiumcontent.so missing dependency
-Prefix:         /usr/local
+Prefix:         <%= installDir %>
 
 %description
 <%= description %>
 
 %install
-mkdir -p %{buildroot}/usr/local/share/atom
-cp -r /tmp/atom-build/Atom/* %{buildroot}/usr/local/share/atom
-mkdir -p %{buildroot}/usr/local/bin/
-ln -sf ../share/atom/resources/app/apm/node_modules/.bin/apm %{buildroot}/usr/local/bin/apm
-cp atom.sh %{buildroot}/usr/local/bin/atom
-chmod 755 atom.sh
-mkdir -p %{buildroot}/usr/local/share/applications/
-mv atom.desktop %{buildroot}/usr/local/share/applications/
+mkdir -p %{buildroot}/<%= installDir %>/share/atom/
+cp -r Atom/* %{buildroot}/<%= installDir %>/share/atom/
+mkdir -p %{buildroot}/<%= installDir %>/bin/
+ln -sf ../share/atom/resources/app/apm/node_modules/.bin/apm %{buildroot}/<%= installDir %>/bin/apm
+cp atom.sh %{buildroot}/<%= installDir %>/bin/atom
+chmod 755 %{buildroot}/<%= installDir %>/bin/atom
+mkdir -p %{buildroot}/<%= installDir %>/share/applications/
+cp atom.desktop %{buildroot}/<%= installDir %>/share/applications/
 
 %files
-/usr/local/bin/atom
-/usr/local/bin/apm
-/usr/local/share/atom/
-/usr/local/share/applications/atom.desktop
+<%= installDir %>/bin/atom
+<%= installDir %>/bin/apm
+<%= installDir %>/share/atom/
+<%= installDir %>/share/applications/atom.desktop

script/mkrpm

@@ -11,7 +11,7 @@ ARCH=`uname -m`
 
 rpmdev-setuptree
 
-cp -r $BUILD_DIRECTORY/Atom/* $RPM_BUILD_ROOT/BUILD
+cp -r $BUILD_DIRECTORY/Atom $RPM_BUILD_ROOT/BUILD
 cp $SPEC_FILE $RPM_BUILD_ROOT/SPECS
 cp ./atom.sh $RPM_BUILD_ROOT/BUILD
 cp $DESKTOP_FILE $RPM_BUILD_ROOT/BUILD

script/rpmbuild

@@ -3,4 +3,4 @@
 set -e
 
 script/build
-script/grunt mkrpm publish-build --stack
+script/grunt mkrpm publish-build --stack --install-dir /usr