Change directories for debian/ubuntu packages

This commit is contained in:
Javi Fontan committed 2013-01-11 10:38:58 -06:00
1 parent c588ce82fe
commit 22dbfca99d
3 files changed
+60 -17

No files matched your search

+14 -3
View File
@@ -36,16 +36,27 @@ DIRS="oneapps stage flow market"
export DESTDIR=$PWD/tmp
if [ "$(id -u)" = "0" ]; then
OWNER_FLAGS='-u oneadmin -g oneadmin'
FLAGS='-u oneadmin -g oneadmin'
fi
FLAVOR="other"
if [ "$PACKAGE_TYPE" = "deb" ]; then
FLAGS="$FLAGS -f debian"
FLAVOR="debian"
fi
# Generate postinstall
sed "s/#FLAVOR#/$FLAVOR/" < $SCRIPTS_DIR/oneapps/postinstall.sh > \
$SCRIPTS_DIR/oneapps/postinstall
chmod +x $SCRIPTS_DIR/oneapps/postinstall
rm -rf $DESTDIR
mkdir $DESTDIR
for TOOL in $DIRS; do
(
cd $TOOL
./install.sh $OWNER_FLAGS
./install.sh $FLAGS
)
done
@@ -54,7 +65,7 @@ cd tmp
fpm -n "$PACKAGE_NAME" -t "$PACKAGE_TYPE" -s dir --vendor "$VENDOR" \
--license "$LICENSE" --description "$DESCRIPTION" --url "$URL" \
-m "$MAINTAINER" -v "$VERSION" \
--after-install $SCRIPTS_DIR/oneapps/postinstall.sh \
--after-install $SCRIPTS_DIR/oneapps/postinstall \
-a all -p $SCRIPTS_DIR/$NAME *
+25 -8
View File
@@ -15,16 +15,17 @@
usage() {
echo
echo "Usage: install.sh [-u install_user] [-g install_group]"
echo "Usage: install.sh [-u install_user] [-g install_group] [-f flavour]"
echo " [-d ONE_LOCATION] [-l] [-h]"
echo
echo "-f: distribution, debian or other"
echo "-d: target installation directory, if not defined it'd be root. Must be"
echo " an absolute path."
echo "-l: creates symlinks instead of copying files, useful for development"
echo "-h: prints this help"
}
TEMP_OPT=`getopt -o hlu:g:d: -n 'install.sh' -- "$@"`
TEMP_OPT=`getopt -o hlu:g:d:f: -n 'install.sh' -- "$@"`
if [ $? != 0 ] ; then
usage
@@ -37,6 +38,7 @@ LINK="no"
ONEADMIN_USER=`id -u`
ONEADMIN_GROUP=`id -g`
SRC_DIR=$PWD
FLAVOR="other"
while true ; do
case "$1" in
@@ -45,18 +47,33 @@ while true ; do
-l) LINK="yes" ; shift ;;
-u) ONEADMIN_USER="$2" ; shift 2;;
-g) ONEADMIN_GROUP="$2"; shift 2;;
-f) FLAVOR="$2"; shift 2;;
--) shift ; break ;;
*) usage; exit 1 ;;
esac
done
echo $FLAVOR
if [ -z "$ROOT" ]; then
LIB_LOCATION="/usr/lib/one/ruby/oneapps"
BIN_LOCATION="/usr/bin"
PACKAGES_LOCATION="/usr/share/one/oneapps"
SHARE_LOCATION="/usr/share/one/oneapps"
ETC_LOCATION="/etc/one"
SUNSTONE_LOCATION="/usr/lib/one/sunstone"
case "$FLAVOR" in
"debian")
LIB_LOCATION="/usr/lib/one/ruby/oneapps"
BIN_LOCATION="/usr/bin"
PACKAGES_LOCATION="/usr/share/opennebula/oneapps"
SHARE_LOCATION="/usr/share/opennebula/oneapps"
ETC_LOCATION="/etc/one"
SUNSTONE_LOCATION="/usr/share/opennebula/sunstone"
;;
*)
LIB_LOCATION="/usr/lib/one/ruby/oneapps"
BIN_LOCATION="/usr/bin"
PACKAGES_LOCATION="/usr/share/one/oneapps"
SHARE_LOCATION="/usr/share/one/oneapps"
ETC_LOCATION="/etc/one"
SUNSTONE_LOCATION="/usr/lib/one/sunstone"
;;
esac
else
LIB_LOCATION="$ROOT/lib/ruby/oneapps"
BIN_LOCATION="$ROOT/bin"
+21 -6
View File
@@ -1,11 +1,26 @@
#!/bin/bash
SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml
SUNSTONE_SERVER=/etc/one/sunstone-server.conf
OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js
OPENNEBULA_JS_NEW=/usr/share/one/oneapps/public/js/opennebula.js
SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth"
APPFLOW_AUTH="/var/lib/one/.one/appflow_auth"
FLAVOR="#FLAVOR#"
case "$FLAVOR" in;
debian)
SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml
SUNSTONE_SERVER=/etc/one/sunstone-server.conf
OPENNEBULA_JS=/usr/share/opennebula/sunstone/public/js/opennebula.js
OPENNEBULA_JS_NEW=/usr/share/opennebula/oneapps/public/js/opennebula.js
SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth"
APPFLOW_AUTH="/var/lib/one/.one/appflow_auth"
;;
*)
SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml
SUNSTONE_SERVER=/etc/one/sunstone-server.conf
OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js
OPENNEBULA_JS_NEW=/usr/share/one/oneapps/public/js/opennebula.js
SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth"
APPFLOW_AUTH="/var/lib/one/.one/appflow_auth"
;;
esac
function print_install_message() {
cat <<EOT