Skip to content

Commit

Permalink
[dist] do not run executables from docdir
Browse files Browse the repository at this point in the history
SLE 11 is building again now
  • Loading branch information
adrianschroeter committed Nov 30, 2015
1 parent 8f1282a commit 327c9d3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions dist/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
CONTRIB_DIR=$(DESTDIR)/usr/share/doc/packages/obs-api/contrib
SERVER_DIR=/usr/lib/obs/server

all: install

install: install_obsapisetup

install_obsapisetup:
install -m 755 ./obsapisetup $(DESTDIR)/etc/init.d/obsapisetup
[ -d $(CONTRIB_DIR) ] || mkdir -p $(CONTRIB_DIR)
install -m 755 ./setup-appliance.sh $(CONTRIB_DIR)/setup-appliance.sh
install -m 755 obsapisetup $(DESTDIR)/etc/init.d/obsapisetup
[ -d $(DESTDIR)$(SERVER_DIR) ] || mkdir -p $(DESTDIR)$(SERVER_DIR)
install -m 755 setup-appliance.sh $(DESTDIR)$(SERVER_DIR)/setup-appliance.sh

ta: test_all

Expand Down
3 changes: 1 addition & 2 deletions dist/obs-server.spec
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,6 @@ chown %{apache_user}:%{apache_group} /srv/www/obs/api/log/production.log
/srv/www/obs/api/config/initializers
%dir /srv/www/obs/api/config/environments
%dir /srv/www/obs/api/files
%dir %{_docdir}/%{obs_api_pkg_name}/contrib
%dir /srv/www/obs/api/db
/srv/www/obs/api/Gemfile
/srv/www/obs/api/Gemfile.lock
Expand All @@ -764,7 +763,7 @@ chown %{apache_user}:%{apache_group} /srv/www/obs/api/log/production.log
/srv/www/obs/api/bin
/srv/www/obs/api/test
/srv/www/obs/docs
%{_docdir}/%{obs_api_pkg_name}/contrib/setup-appliance.sh
/usr/lib/obs/server/setup-appliance.sh

/srv/www/obs/api/config/locales
%dir /srv/www/obs/api/vendor
Expand Down
2 changes: 1 addition & 1 deletion dist/obsapisetup
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ rc_reset
case "$1" in
start)
[[ $HOME == '' ]] && export HOME=/root
/usr/share/doc/packages/obs-api/contrib/setup-appliance.sh --non-interactive --setup-only
/usr/lib/obs/server/setup-appliance.sh --non-interactive --setup-only
rc_status -v
;;
stop)
Expand Down

0 comments on commit 327c9d3

Please sign in to comment.