From 84e3fcb0ae2d09c24cf0d18a38e8744574b08a85 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Tue, 5 Feb 2019 16:06:42 +0530
Subject: [PATCH] [packaging] Add checkpoints in prerm scripts

- Add failsafe in case of non existant files or directories.

Change-Id: I85db04381c3e16f04638086152945463a8004c19


[ROCm/hip commit: 31dd6bc83032386d34732aa7ee56d765d635bb41]
---
 projects/hip/packaging/hip_base.prerm | 12 ++++++++----
 projects/hip/packaging/hip_hcc.prerm  |  8 +++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/projects/hip/packaging/hip_base.prerm b/projects/hip/packaging/hip_base.prerm
index 5985cc30ec..837008f3e8 100755
--- a/projects/hip/packaging/hip_base.prerm
+++ b/projects/hip/packaging/hip_base.prerm
@@ -10,14 +10,17 @@ popd () {
 
 ROCMDIR=/opt/rocm
 HIPDIR=$ROCMDIR/hip
+([ ! -d $ROCMDIR ] || [ ! -d $HIPDIR ]) && exit 0
 
 # Remove soft-link to bin files
-HIPBINFILES=$HIPDIR/bin/*
+HIPBINDIR=$HIPDIR/bin
 ROCMBINDIR=$ROCMDIR/bin
+([ ! -d $ROCMBINDIR ] || [ ! -d $HIPBINDIR ]) && exit 0
+HIPBINFILES=$HIPBINDIR/*
 pushd $ROCMBINDIR
-for f in $HIPBINFILES
-do
-rm $(basename $f)
+for f in $HIPBINFILES; do
+    [ -e $f ] || continue
+    rm $(basename $f)
 done
 rm .hipVersion
 popd
@@ -26,6 +29,7 @@ rmdir --ignore-fail-on-non-empty $ROCMBINDIR
 # Remove soft-link to headers
 HIPINCDIR=$HIPDIR/include
 ROCMINCDIR=$ROCMDIR/include
+([ ! -d $ROCMINCDIR ] || [ ! -d $HIPINCDIR ]) && exit 0
 pushd $ROCMINCDIR
 rm hip
 popd
diff --git a/projects/hip/packaging/hip_hcc.prerm b/projects/hip/packaging/hip_hcc.prerm
index ee64aea632..8d7d8b93b2 100755
--- a/projects/hip/packaging/hip_hcc.prerm
+++ b/projects/hip/packaging/hip_hcc.prerm
@@ -12,13 +12,15 @@ ROCMDIR=/opt/rocm
 ROCMLIBDIR=$ROCMDIR/lib
 HIPDIR=$ROCMDIR/hip
 HIPLIBDIR=$ROCMDIR/hip/lib
+([ ! -d $ROCMDIR ] || [ ! -d $HIPDIR ]) && exit 0
+([ ! -d $ROCMLIBDIR ] || [ ! -d $HIPLIBDIR ]) && exit 0
 
 # Remove soft-links to libraries
 HIPLIBFILES=$(ls -aF $HIPLIBDIR | grep -v [-/$])
 pushd $ROCMLIBDIR
-for f in $HIPLIBFILES
-do
-rm $(basename $f)
+for f in $HIPLIBFILES; do
+    [ -e $f ] || continue
+    rm $(basename $f)
 done
 pushd cmake
 unlink hip