From 65d74ee43c779bdf33b1680f30f420976e5ce9e0 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Mon, 24 Dec 2018 08:11:29 +0200 Subject: [PATCH] build: use --after-{install,remove} scripts Fixes #1455 Signed-off-by: Ruslan Kuprieiev --- scripts/build_posix.sh | 20 ++++++++++---------- scripts/fpm/after-install.sh | 2 ++ scripts/fpm/after-remove.sh | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 scripts/fpm/after-install.sh create mode 100644 scripts/fpm/after-remove.sh diff --git a/scripts/build_posix.sh b/scripts/build_posix.sh index a5ec914f1..e0c355295 100755 --- a/scripts/build_posix.sh +++ b/scripts/build_posix.sh @@ -12,7 +12,6 @@ else fi BUILD_DIR=build -BIN_DIR=$BUILD_DIR/$INSTALL_DIR/bin LIB_DIR=$BUILD_DIR/$INSTALL_DIR/lib print_error() @@ -41,7 +40,15 @@ fpm_build() { print_info "Building $1..." VERSION=$(python -c "import dvc; from dvc import VERSION; print(str(VERSION))") - fpm -s dir -f -t $1 $FPM_FLAGS -n dvc -v $VERSION -C $BUILD_DIR usr + fpm -s dir \ + -f \ + -t $1 \ + $FPM_FLAGS \ + -n dvc \ + -v $VERSION \ + --after-install scripts/fpm/after-install.sh \ + --after-remove scripts/fpm/after-remove.sh \ + -C $BUILD_DIR usr } cleanup() @@ -67,7 +74,7 @@ install_dependencies() echo "Unable to install fpm dependencies" && exit 1 fi - gem install --no-document fpm + sudo gem install --no-document fpm print_info "Installing requirements..." pip install -r requirements.txt @@ -86,13 +93,6 @@ build_dvc() --specpath $BUILD_DIR $LIB_DIR/dvc/dvc --help - - mkdir -p $BIN_DIR - pushd $BIN_DIR - ln -s ../lib/dvc/dvc dvc - popd - - $BIN_DIR/dvc --help } cleanup diff --git a/scripts/fpm/after-install.sh b/scripts/fpm/after-install.sh new file mode 100644 index 000000000..d80d9750c --- /dev/null +++ b/scripts/fpm/after-install.sh @@ -0,0 +1,2 @@ +#!/bin/sh +ln -sf /usr/local/lib/dvc/dvc /usr/local/bin/dvc diff --git a/scripts/fpm/after-remove.sh b/scripts/fpm/after-remove.sh new file mode 100644 index 000000000..1a2477a5d --- /dev/null +++ b/scripts/fpm/after-remove.sh @@ -0,0 +1,2 @@ +#!/bin/sh +rm -rf /usr/local/bin/dvc