Update pydio.spec.tpl

Author: cdujeu

dist/rpm/pydio.spec.tpl

@@ -22,11 +22,7 @@ Pydio is a web-based browser for managing files on a web server without FTP. Ful
  it is the perfect tool to replace (drop)box and alikes in the enterprise.
 
 %prep
-
-if [ $1 -gt 1 ]; then
-   # For upgrades
-   [ -f ./.htaccess ] && cp -pf ./.htaccess  /tmp/pydio.update.htaccess
-fi
+[ -f %{buildroot}%{pydiodir}/.htaccess ] && cp -pf %{buildroot}%{pydiodir}/.htaccess /tmp/pydio.update.htaccess
 
 %setup -q -n %{name}-core-%{version}
 
@@ -93,23 +89,18 @@ rm -rf %{buildroot}
 if [ -f "%{_localstatedir}/cache/%{name}/plugins_cache.ser" ]
 then
 # Upgrading an existing install
+[ -f /tmp/pydio.update.htaccess ]  &&  cp -pf /tmp/pydio.update.htaccess %{buildroot}%{pydiodir}/.htaccess
 rm -f %{_localstatedir}/cache/%{name}/i18n/*.ser
 rm -f %{_localstatedir}/cache/%{name}/plugins_*.ser
 if [ ! -f "%{_localstatedir}/cache/%{name}/first_run_passed" ]
 then
 touch %{_localstatedir}/cache/%{name}/first_run_passed
 fi
+else
+# Brand new install
+[ -f %{buildroot}%{pydiodir}/.htaccess ] && cp -p ./plugins/boot.conf/htaccess.tpl.linux %{buildroot}%{pydiodir}/.htaccess
 fi
 
-if [ $1 -gt 1 ]; then
-   # For upgrades
-   [ -f /tmp/pydio.update.htaccess ]  &&  cp -pf /tmp/pydio.update.htaccess %{buildroot}%{pydiodir}/.htaccess
-fi
-
-if [ $1 -eq 1 ]; then
-    # For install
-  [ -f %{buildroot}%{pydiodir}/.htaccess ] && cp -p ./plugins/boot.conf/htaccess.tpl.linux %{buildroot}%{pydiodir}/.htaccess
-fi
 
 %changelog
 * Wed Jun 01 2013 Charles du Jeu <charles@ajaxplorer.info> - 5.0.0-1