Merge pull request #281 from arista-eosplus/fix-rpmbuild

Modify setup.py and ztpserver.spec to fix rpmbuild

rpm/ztpserver.spec

@@ -117,6 +117,7 @@ cp -rp $RPM_BUILD_DIR%{app_virtualenv_dir}/* $RPM_BUILD_ROOT%{app_virtualenv_dir
 # Force some paths for install to handle the virtual_env case for RHEL
 %{__install} -d $RPM_BUILD_ROOT%{python2_sitelib}
 PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitelib}:${PYTHONPATH} \
+ZTPS_INSTALL_ROOT=$RPM_BUILD_ROOT \
 python setup.py install --root=$RPM_BUILD_ROOT  --install-scripts=%{_bindir} \
 --install-lib=%{python2_sitelib}
 
@@ -163,6 +164,7 @@ chcon -Rv --type=httpd_sys_content_t %{_datadir}/ztpserver
 %{_bindir}/ztps
 
 %dir %{_sysconfdir}/ztpserver
+%{_sysconfdir}/ztpserver/.VERSION
 %config(noreplace) %{_sysconfdir}/ztpserver/ztpserver.conf
 %config(noreplace) %{_sysconfdir}/ztpserver/ztpserver.wsgi
 %config(noreplace) %{httpd_dir}/%{name}-wsgi.conf

setup.py

@@ -43,7 +43,13 @@
     from distutils.core import setup
 
 def install():
-    return sys.argv[1:] == ['install']
+    if "install" in sys.argv:
+        return True
+    else:
+        return False
+
+def join_url(x, y):
+    return '/' + '/'.join([z for z in x.split('/') + y.split('/') if z])
 
 conf_path = config.CONF_PATH
 install_path = config.INSTALL_PATH
@@ -103,7 +109,7 @@ def install():
     file_list += [(filename.split('/')[-1],
                    '%s/actions' % install_path,
                    filename)]
-for filename in glob('clent/lib/*'):
+for filename in glob('client/lib/*'):
     file_list += [(filename.split('/')[-1],
                    '%s/files/lib' % install_path,
                    filename)]
@@ -133,4 +139,9 @@ def install():
 
 # hidden version file
 if install():
-    shutil.copy('VERSION', config.VERSION_FILE_PATH)
+    custom_path = os.environ.get('ZTPS_INSTALL_ROOT')
+    if custom_path:
+        shutil.copy('VERSION', join_url(custom_path, config.VERSION_FILE_PATH))
+    else:   
+        shutil.copy('VERSION', config.VERSION_FILE_PATH)
+