summaryrefslogtreecommitdiffstats
path: root/tools/installer
diff options
context:
space:
mode:
authorSebastian Schmelzer2010-09-15 10:51:28 +0200
committerSebastian Schmelzer2010-09-15 10:51:28 +0200
commit9c7e8aa0e7940746b1a4d2542717a68f52aa3a83 (patch)
treebe539d8e65c499e8058f7d45698e4151e7ad66cd /tools/installer
parentmakefile uses new installer now (diff)
downloadcore-9c7e8aa0e7940746b1a4d2542717a68f52aa3a83.tar.gz
core-9c7e8aa0e7940746b1a4d2542717a68f52aa3a83.tar.xz
core-9c7e8aa0e7940746b1a4d2542717a68f52aa3a83.zip
minor changes
Diffstat (limited to 'tools/installer')
-rwxr-xr-xtools/installer42
1 files changed, 27 insertions, 15 deletions
diff --git a/tools/installer b/tools/installer
index 998bb97d..b2eb3e8e 100755
--- a/tools/installer
+++ b/tools/installer
@@ -33,6 +33,17 @@ git_version()
fi
}
+print_banner()
+{
+
+ echo " ____ ______ _ __ "
+ echo " / __ \___ ___ ___ / __/ / | |/_/ "
+ echo " / /_/ / _ | -_) _ \_\ \/ /___> < "
+ echo " \____/ .__|__/_//_/___/____/_/|_| "
+ echo " /_/ http://www.openslx.org"
+ echo -e "\nVersion: $(git_version)\n"
+}
+
check_perl()
{
echo -n " * checking perl"
@@ -325,20 +336,14 @@ check_upgrade()
postinstall()
{
# create default config folder hierarchy:
-# perl -Ilib -e 'use OpenSLX::ConfigFolder; createConfigFolderForDefaultSystem();'
-#
-# # create complete default settings and empty local settings file:
-# echo -e "# default setup for OpenSLX-installation\
-#\n\
-#\n# paths that are fixed at packaging/installation time:\
-#\nSLX_BASE_PATH=${SLX_BASE_PATH}\
-#\nSLX_CONFIG_PATH=${SLX_CONFIG_PATH}\
-#\n\
-#\n# paths which can be adjusted after installation:\
-#\nSLX_PRIVATE_PATH=${SLX_PRIVATE_PATH}\
-#\nSLX_PUBLIC_PATH=${SLX_PUBLIC_PATH}\
-#\nSLX_TEMP_PATH=${SLX_TEMP_PATH}\n" \
-# > $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/settings.default; \
+ perl -Ilib -e 'use OpenSLX::ConfigFolder; createConfigFolderForDefaultSystem();'
+
+ # create complete default settings and empty local settings file:
+ sed -e 's///' \
+ ./tools/inc/openslx.settings.dist \
+ $SLX_BUILD_PATH/$SLX_BASE_PATH/share/settings.default
+
+
# test -e $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/settings || \
# echo -e "# Local setup for OpenSLX (overrides default settings).\
#\n#\n# Please look at $(SLX_BASE_PATH)/share/settings.default and the docs to learn\
@@ -497,7 +502,7 @@ build_rpm_package()
clean()
{
echo -n " * Cleanup OpenSLX source directory"
- for file in ${SLX_INSTALL_LOG} openslx-*.tar.bz2; do
+ for file in ${SLX_INSTALL_LOG} openslx-*.tar openslx-*.tar.*; do
rm -f ${file}
done
rm -rf _install
@@ -537,12 +542,14 @@ cmd_install()
cmd_build_rpm()
{
echo "creating rpm package(s)"
+ prepare_install
build_rpm_package
}
cmd_build_deb()
{
echo "creating deb package"
+ prepare_install
build_dpkg_package
}
@@ -550,7 +557,10 @@ cmd_build_deb()
cmd_build_tarball()
{
echo "creating deb package"
+ prepare_install
make_install_tarball bzip2
+ mkdir -p pkgs/
+ cp openslx*.tar.bz2 pkgs/
}
cmd_clean()
@@ -572,6 +582,8 @@ cmd_mrproper()
}
+print_banner
+
case "$1" in
"plain-install")
cmd_plain_install