diff options
| author | Sebastian Schmelzer | 2010-09-06 10:59:34 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2010-09-06 11:00:59 +0200 |
| commit | 005675dc1a58ba3b54e51322461161ba65102e02 (patch) | |
| tree | 686d270b366750f56c8c052a8c8998c389b70672 | |
| parent | first steps for new makefile (diff) | |
| download | core-005675dc1a58ba3b54e51322461161ba65102e02.tar.gz core-005675dc1a58ba3b54e51322461161ba65102e02.tar.xz core-005675dc1a58ba3b54e51322461161ba65102e02.zip | |
minor changes
| -rw-r--r-- | Make.exclude_from_tar | 3 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rwxr-xr-x | tools/installer | 12 |
3 files changed, 10 insertions, 14 deletions
diff --git a/Make.exclude_from_tar b/Make.exclude_from_tar deleted file mode 100644 index deacf194..00000000 --- a/Make.exclude_from_tar +++ /dev/null @@ -1,3 +0,0 @@ -.svn -.*.swp -openslx-*.tar.bz2 @@ -257,15 +257,6 @@ postinstall: install: check-upgrade dep-check plain-install postinstall -vmware_install: - @# we should read the config file here or better have a separate - @# script for installing vmware related stuff - @echo "Installing VMware files to $(SLX_BASE_PATH)/vmware" - @mkdir -p $(SLX_BASE_PATH)/vmware/templ \ - -p $(SLX_BASE_PATH)/vmware/vmsessions/kdm - @cp -a vmware/* $(SLX_BASE_PATH)/vmware/templ/ - @echo -e "Please configure your exports (add $(SLX_BASE_PATH)/vmware to your list).\nCopy your *.vmdk files into $(SLX_BASE_PATH)/vmware. For interactive mode add for each virtual machine (*.vmdk) a .desktop file into ./vmsessions (example file $(SLX_BASE_PATH)/vmware/templ/desktop.template). Don't forget to install Xdialog!" - prepare_upgrade: @rm -rf $(SLX_BASE_PATH) @rm -f $(USR_BIN_PATH)/slx* diff --git a/tools/installer b/tools/installer index 33e8683d..30eda9f0 100755 --- a/tools/installer +++ b/tools/installer @@ -4,6 +4,14 @@ DISTRO=$(lsb_release -i| sed 's/^[^:]*:\t//' | tr '[:upper:]' '[:lower:]') +[ -z $USR_BIN_PATH ] && USR_BIN_PATH=/usr/bin +[ -z $SLX_CONFIG_PATH ] && SLX_CONFIG_PATH=/etc/opt/openslx +[ -z $SLX_BASE_PATH ] && SLX_BASE_PATH=/opt/openslx +[ -z $SLX_PRIVATE_PATH ] && SLX_PRIVATE_PATH=/var/opt/openslx +[ -z $SLX_PUBLIC_PATH ] && SLX_PUBLIC_PATH=/srv/openslx +[ -z $SLX_TEMP_PATH ] && SLX_TEMP_PATH=/tmp +[ -z $SLX_INSTALL_LOG ] && SLX_INSTALL_LOG=install.log + # helper functions: git_version() @@ -53,7 +61,7 @@ perl_dep_check() fi } -make_tarball() +make_source_tarball() { echo -n " * create openslx tarball" VERSIONSTRING="openslx-$(git_version)" @@ -64,5 +72,5 @@ make_tarball() } perl_dep_check -make_tarball +make_source_tarball git_version
\ No newline at end of file |