Fix makebuildserver after rename, tidy gitignores

diff --git a/.gitignore b/.gitignore
index cdf207c3969b4965aafa683497f354d9fef63960..b442d84d6529d83b46e011285cfe4630e34c4410 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,15 +6,3 @@
 *.box
 # files generated by build
 FDroidServer.egg-info/
-# generated docs files
-docs/fdroid.aux
-docs/fdroid.cp
-docs/fdroid.cps
-docs/fdroid.fn
-docs/fdroid.info
-docs/fdroid.ky
-docs/fdroid.log
-docs/fdroid.pg
-docs/fdroid.toc
-docs/fdroid.tp
-docs/fdroid.vr

diff --git a/docs/.gitignore b/docs/.gitignore
index 2886ec4f58e1ce666ee00aed77c72074d84a23eb..642a2e6a3c47b859e09301b395676ec17c79ee5e 100644 (file)
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1 +1,13 @@
-manual/
+/manual/
+# generated docs files
+/fdroid.aux
+/fdroid.cp
+/fdroid.cps
+/fdroid.fn
+/fdroid.info
+/fdroid.ky
+/fdroid.log
+/fdroid.pg
+/fdroid.toc
+/fdroid.tp
+/fdroid.vr

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 7ad95630a14b94dbaa33151359a24d7b53e50d48..a00063883de7eda71551a25cbc11ee64cc275195 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1408,7 +1408,7 @@ proxy definition, both of which may need customising for your environment.
 You can then go to the @code{fdroidserver} directory and run this:
 
 @example
-./makebuildserver.py
+./makebuildserver
 @end example
 
 This will take a long time, and use a lot of bandwidth - most of it spent

diff --git a/makebuildserver b/makebuildserver
index 247741645dd826cb6ab479fe05f68c3d82501ab5..3e81da79f5792f48399aa45aedaa961f47b56742 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -44,7 +44,7 @@ options, args = parser.parse_args()
 config = {}
 execfile('makebs.config.py', config)
 
-if not os.path.exists('makebuildserver.py') or not os.path.exists(serverdir):
+if not os.path.exists('makebuildserver') or not os.path.exists(serverdir):
     print 'This must be run from the correct directory!'
     sys.exit(1)
 

diff --git a/sampleconfigs/makebs.config.sample.py b/sampleconfigs/makebs.config.sample.py
index 14fcaae50e6c2ae67f4a0cb37233dd4cc6a6304e..4370765d687b21cb43389d89433f4f534346c60c 100644 (file)
--- a/sampleconfigs/makebs.config.sample.py
+++ b/sampleconfigs/makebs.config.sample.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2
 
-# You will need to alter these before running makebuildserver.py
+# You will need to alter these before running ./makebuildserver
 
 # Name of the base box to use...
 basebox = "raring32"