v1.52.0 (ae84feaf) · Commits · github_fork / Homer3

DataTree/ProcStream/ProcStreamClass.m

+1 −1

Original line number	Diff line number	Diff line
		@@ -705,7 +705,7 @@ classdef ProcStreamClass < handle
		fprintf('Default config file exists. Processing stream will be loaded from %s\n', fname);
		return;
		end
		fname = OpenFileGUI(procStreamCfgFile, pathname,'Load Processing Options File');
		fname = OpenFileGUI(procStreamCfgFile, pathname,'Load Processing Options File','.cfg');
		if isempty(fname)
		fname = [pathname, procStreamCfgFile];
		fprintf('Loading default config file.\n');

Install/homePageFullPath.m

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		function pathname = homePageFullPath()
		pathname = '';
		currdir = pwd;
		if ismac() \|\| islinux()
		cd('~/');
		pathname = filesepStandard(pwd);
		end
		cd(currdir)

Install/run_Homer3.sh

deleted100755 → 0

+0 −32

Original line number	Diff line number	Diff line
		#!/bin/sh
		# script for execution of deployed applications
		#
		# Sets up the MATLAB Runtime environment for the current $ARCH and executes
		# the specified command.
		#
		exe_name=$0
		exe_dir=`dirname "$0"`
		echo "------------------------------------------"
		if [ "x$1" = "x" ]; then
		echo Usage:
		echo $0 \<deployedMCRroot\> args
		else
		echo Setting up environment variables
		MCRROOT="$1"
		echo ---
		DYLD_LIBRARY_PATH=.:${MCRROOT}/runtime/maci64 ;
		DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/bin/maci64 ;
		DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/sys/os/maci64;
		export DYLD_LIBRARY_PATH;
		echo DYLD_LIBRARY_PATH is ${DYLD_LIBRARY_PATH};
		shift 1
		args=
		while [ $# -gt 0 ]; do
		token=$1
		args="${args} \"${token}\""
		shift
		done
		eval "\"${exe_dir}/Homer3.app/Contents/MacOS/Homer3\"" $args
		fi
		exit

Install/setup.command

deleted100755 → 0

+0 −61

Original line number	Diff line number	Diff line
		#!/bin/sh
		# script for execution of deployed applications
		#
		# Sets up the MATLAB Runtime environment for the current $ARCH and executes
		# the specified command.
		#
		exe_name=$0
		current_dir=$(pwd)
		script_dir=$(dirname $0)
		if [ $script_dir = '.' ]; then
		script_dir="$current_dir"
		fi
		echo "Current folder: " $script_dir
		err=0;
		if [ "$script_dir" = "$HOME/Downloads/homer3_install" ]; then
		echo "Installation folder is correct..."
		else
		echo "Wrong installation folder...Please move homer3_install to Downloads and rerun setup from there"
		touch $script_dir.error
		err=1;
		fi

		if [ $err = 1 ]; then
		if [ -d ~/Downloads/homer3_install ]; then
		echo ~/Downloads/homer3_install exists .... Deleting ~/Downloads/homer3_install
		rm -rf ~/Downloads/homer3_install;
		else
		echo ~/Downloads/homer3_install does not exist ... will create it
		fi
		echo cp -r $script_dir ~/Downloads/homer3_install;
		cp -r $script_dir ~/Downloads/homer3_install;
		fi
		rm -rf ~/libs; mkdir ~/libs
		if [ ! -L "~/libs/mcr" ]; then ln -s /Applications/MATLAB/MATLAB_Runtime/v93 ~/libs/mcr; fi
		libsdir=~/libs/mcr
		exe_dir=~/Downloads/homer3_install
		echo "------------------------------------------"
		if [ "x$libsdir" = "x" ]; then
		echo Usage:
		echo $0 \<deployedMCRroot\> args
		else
		echo Setting up environment variables
		MCRROOT="$libsdir"
		echo ---
		DYLD_LIBRARY_PATH=.:${MCRROOT}/runtime/maci64 ;
		DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/bin/maci64 ;
		DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/sys/os/maci64;
		export DYLD_LIBRARY_PATH;
		echo DYLD_LIBRARY_PATH is ${DYLD_LIBRARY_PATH};
		shift 1
		args=
		while [ $# -gt 0 ]; do
		token=$libsdir
		args="${args} \"${token}\""
		shift
		done
		eval "\"${exe_dir}/setup.app/Contents/MacOS/setup\"" $args
		fi
		osascript -e 'tell application "Terminal" to quit' &

		exit

Install/setup.m

+10 −9

Original line number	Diff line number	Diff line
		@@ -6,8 +6,6 @@ global dirnameDst

		try

		setNamespace('Homer3');

		currdir = filesepStandard(pwd);

		h = waitbar(0,'Installation Progress ...');
		@@ -45,7 +43,7 @@ cd(currdir)

		% ------------------------------------------------------------
		function main()
		global h
		global h %#ok<*GVMIS>
		global nSteps
		global iStep
		global platform
		@@ -145,11 +143,12 @@ end

		% Change source dir if not on PC
		if ~ispc()
		dirnameSrc = sprintf('~/Downloads/%s_install/', lower(getAppname));
		dirnameSrc0 = dirnameSrc;
		dirnameSrc = sprintf('%sDownloads/%s_install/', homePageFullPath(), lower(getAppname));
		fprintf('SETUP: current folder is %s\n', pwd);

		if ~isdeployed()
		rmdir_safe(sprintf('~/Desktop/%s_install/', lower(getAppname())));
		rmdir_safe(sprintf('%sDesktop/%s_install/', homePageFullPath(), lower(getAppname())));
		if ~pathscompare(dirnameSrc, dirnameSrc0)
		rmdir_safe(dirnameSrc);
		if ispathvalid(dirnameSrc)
		@@ -157,15 +156,14 @@ if ~ispc()
		end
		copyFile(dirnameSrc0, dirnameSrc);
		end
		rmdir_safe('~/Desktop/Test/');
		rmdir_safe(sprintf('%sDesktop/Test/', homePageFullPath()));

		if ispathvalid('~/Desktop/%s_install/')
		if ispathvalid(sprintf('%sDesktop/%s_install/', homePageFullPath()))
		err = -1;
		end
		if ispathvalid('~/Desktop/Test/')
		if ispathvalid(sprintf('%sDesktop/Test/', homePageFullPath()))
		err = -1;
		end

		cd(dirnameSrc);
		end
		end
		@@ -288,3 +286,6 @@ catch ME
		return;
		end

Admin message