Changeset 44674 in vbox

Timestamp:

Feb 13, 2013 8:29:33 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83769

Message:

Installer/linux: no need to have two different versions of VBox.sh.

Location:

trunk

Files:

trunk/debian/rules

r43720	r44674
239	239	mv $(archdir)/vboxshell.py $(prefix)/usr/lib/$(package)
240	240	mv $(archdir)/sdk $(prefix)/usr/lib/$(package)
241		~~install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/debian~~/VBox.sh $(prefix)/usr/bin/VBox
	241	install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/VBox.sh $(prefix)/usr/bin/VBox
242	242	mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
243	243	mv $(archdir)/VBoxCreateUSBNode.sh $(prefix)/usr/share/$(package)

-              r44580
+              r44674
 CONFIG="/etc/vbox/vbox.cfg"
+if [ ! -r "$CONFIG" ]; then
+if test -r "${CONFIG}"; then
+    . "${CONFIG}"
+elif test -f /usr/lib/virtualbox/VirtualBox &&
+    test -x /usr/lib/virtualbox/VirtualBox; then
+    INSTALL_DIR=/usr/lib/virtualbox
+else
     echo "Could not find VirtualBox installation. Please reinstall."
     exit 1
 fi
-. "$CONFIG"
 # Note: This script must not fail if the module was not successfully installed

r44162	r44674
264	264	mv $(archdir)/vboxshell.py $(prefix)/usr/lib/$(package)
265	265	mv $(archdir)/sdk $(prefix)/usr/lib/$(package)
266		~~install -D -g 0 -o 0 -m 644 debian/~~VBox.sh $(prefix)/usr/bin/VBox
	266	install -D -g 0 -o 0 -m 644 VBox.sh $(prefix)/usr/bin/VBox
267	267	mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
268	268	mv $(archdir)/VBoxCreateUSBNode.sh $(prefix)/usr/share/$(package)

r43948	r44674
231	231	cp vboxautostart-service.sh $(archdir)/vboxautostart-service.init
232	232	cp vboxweb-service.sh $(archdir)/vboxweb-service.init
233		~~cp debian/~~VBox.sh $(archdir)
	233	cp VBox.sh $(archdir)
234	234	mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
235	235	tar -cjf rpm/VirtualBox.tar.bz2 -C rpm $(rpmname)

Note: See TracChangeset for help on using the changeset viewer.