Browse code

Merge "Deal with different django-admin executables"

Jenkins authored on 2014/11/19 14:28:26
Showing 1 changed files
... ...
@@ -142,8 +142,16 @@ function init_horizon {
142 142
     # and run_process
143 143
     sudo rm -f /var/log/$APACHE_NAME/horizon_*
144 144
 
145
-    DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py collectstatic --noinput
146
-    DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py compress --force
145
+    # Setup alias for django-admin which could be different depending on distro
146
+    local django_admin
147
+    if type -p django-admin > /dev/null; then
148
+        django_admin=django-admin
149
+    else
150
+        django_admin=django-admin.py
151
+    fi
152
+
153
+    DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $django_admin collectstatic --noinput
154
+    DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $django_admin compress --force
147 155
 
148 156
 }
149 157