diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index aaec329..e417d2e 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -15,8 +15,9 @@ export THREADS # root -ROOT_DIR=`realpath "$0"` -ROOT_DIR=`dirname "$ROOT_DIR"` +OLDDIR=`pwd` +ROOT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" ROOT_DIR=`dirname "$ROOT_DIR"` ROOT_DIR=`dirname "$ROOT_DIR"` export ROOT_DIR diff --git a/docker-builder-data/build/script/packet/opentoonz-appimage.sh b/docker-builder-data/build/script/packet/opentoonz-appimage.sh index 7e9abb4..f12e5eb 100644 --- a/docker-builder-data/build/script/packet/opentoonz-appimage.sh +++ b/docker-builder-data/build/script/packet/opentoonz-appimage.sh @@ -6,7 +6,7 @@ PK_APPDIR_NAME="opentoonz" pkinstall() { # copy files from envdeps (install requires envdeps explicit) - local APPDIR="$INSTALL_RELEASE_PACKET_DIR/$PK_APPDIR_NAME.AppDir" + local APPDIR="$INSTALL_PACKET_DIR/$PK_APPDIR_NAME.AppDir" mkdir -p "$APPDIR/usr" if ! cp "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/"; then return 1 diff --git a/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh b/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh index 0f84b34..d28148f 100755 --- a/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh @@ -1,12 +1,13 @@ #!/bin/sh +OLDDIR=`pwd` SCRIPT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" BASE_DIR=`dirname "$SCRIPT_DIR"` export LD_LIBRARY_PATH="$BASE_DIR/lib:$BASE_DIR/lib64:$LD_LIBRARY_PATH" export QT_XKB_CONFIG_ROOT=$QT_XKB_CONFIG_ROOT:/usr/local/share/X11/xkb:/usr/share/X11/xkb -OLDDIR=`pwd` cd "$BASE_DIR/bin" ./opentoonz "$@" cd "$OLDDIR" diff --git a/docker-builder-i386/Dockerfile b/docker-builder-i386/Dockerfile index f6ebc5e..7232720 100644 --- a/docker-builder-i386/Dockerfile +++ b/docker-builder-i386/Dockerfile @@ -9,7 +9,6 @@ RUN apt-get -yq upgrade # Install tools RUN apt-get -yq install \ sudo \ - realpath \ pkg-config \ g++ \ make diff --git a/docker-builder-i386/build.sh b/docker-builder-i386/build.sh index 0d76147..d088a29 100755 --- a/docker-builder-i386/build.sh +++ b/docker-builder-i386/build.sh @@ -1,7 +1,8 @@ #!/bin/bash -SCRIPT_FILE=`realpath "$0"` -SCRIPT_DIR=`dirname "$SCRIPT_FILE"` +OLDDIR=`pwd` +SCRIPT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" BASE_DIR=`dirname "$SCRIPT_DIR"` CONFIG_FILE="$BASE_DIR/config.sh" diff --git a/docker-builder-i386/run.sh b/docker-builder-i386/run.sh index 59d6a85..6e9d3ab 100755 --- a/docker-builder-i386/run.sh +++ b/docker-builder-i386/run.sh @@ -1,7 +1,8 @@ #!/bin/bash -SCRIPT_FILE=`realpath "$0"` -SCRIPT_DIR=`dirname "$SCRIPT_FILE"` +OLDDIR=`pwd` +SCRIPT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" BASE_DIR=`dirname "$SCRIPT_DIR"` DATA_DIR="$BASE_DIR/docker-builder-data" diff --git a/docker-builder/Dockerfile b/docker-builder/Dockerfile index 7081c5b..34939d2 100644 --- a/docker-builder/Dockerfile +++ b/docker-builder/Dockerfile @@ -9,7 +9,6 @@ RUN apt-get -yq upgrade # Install tools RUN apt-get -yq install \ sudo \ - realpath \ pkg-config \ g++ \ make diff --git a/docker-builder/build.sh b/docker-builder/build.sh index 0a5fa8f..ff7c574 100755 --- a/docker-builder/build.sh +++ b/docker-builder/build.sh @@ -1,7 +1,8 @@ #!/bin/bash -SCRIPT_FILE=`realpath "$0"` -SCRIPT_DIR=`dirname "$SCRIPT_FILE"` +OLDDIR=`pwd` +SCRIPT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" BASE_DIR=`dirname "$SCRIPT_DIR"` CONFIG_FILE="$BASE_DIR/config.sh" diff --git a/docker-builder/run.sh b/docker-builder/run.sh index e03f7a0..bec9efe 100755 --- a/docker-builder/run.sh +++ b/docker-builder/run.sh @@ -1,7 +1,8 @@ #!/bin/bash -SCRIPT_FILE=`realpath "$0"` -SCRIPT_DIR=`dirname "$SCRIPT_FILE"` +OLDDIR=`pwd` +SCRIPT_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" BASE_DIR=`dirname "$SCRIPT_DIR"` DATA_DIR="$BASE_DIR/docker-builder-data" diff --git a/restore_owner.sh b/restore_owner.sh index ef8c71f..6b3999e 100755 --- a/restore_owner.sh +++ b/restore_owner.sh @@ -1,7 +1,8 @@ #!/bin/bash -SCRIPT_FILE=`realpath "$0"` -BASE_DIR=`dirname "$SCRIPT_FILE"` +OLDDIR=`pwd` +BASE_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" DATA_DIR="$BASE_DIR/docker-builder-data" CONFIG_FILE="$BASE_DIR/config.sh" diff --git a/run-native.sh b/run-native.sh index 51648d3..f1d7cb5 100755 --- a/run-native.sh +++ b/run-native.sh @@ -1,7 +1,8 @@ #!/bin/bash -SCRIPT_FILE=`realpath "$0"` -BASE_DIR=`dirname "$SCRIPT_FILE"` +OLDDIR=`pwd` +BASE_DIR=$(cd `dirname "$0"`; pwd) +cd "$OLDDIR" DATA_DIR="$BASE_DIR/docker-builder-data" BUILD_DIR=$DATA_DIR/build