mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upon failure, 'cd' itself already prints a message to stderr

Browse Source 
Change-Id: Iabe3a6bb14ca3e83a0792d7fc131ae0ac74e578c
This commit is contained in:
Stephan Bergmann
2017-02-11 12:54:24 +01:00
parent ad849f4bda
commit 709709962d
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/scripts/soffice.sh
View File

@@ -39,26 +39,19 @@ export SAL_ENABLE_FILE_LOCKING
#@JITC_PROCESSOR_TYPE_EXPORT@ #@JITC_PROCESSOR_TYPE_EXPORT@
cd_or_exit() {
if ! cd "$1"; then
echo "Can't cd to $1"
exit 1
fi
}
# resolve installation directory # resolve installation directory
sd_cwd=$(pwd) sd_cwd=$(pwd)
sd_res="$0" sd_res="$0"
while [ -h "$sd_res" ] ; do while [ -h "$sd_res" ] ; do
sd_dirname=$(dirname "$sd_res") sd_dirname=$(dirname "$sd_res")
cd_or_exit "$sd_dirname" cd "$sd_dirname" || exit $?
sd_basename=$(basename "$sd_res") sd_basename=$(basename "$sd_res")
sd_res=$(ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g") sd_res=$(ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g")
done done
sd_dirname=$(dirname "$sd_res") sd_dirname=$(dirname "$sd_res")
cd_or_exit "$sd_dirname" cd "$sd_dirname" || exit $?
sd_prog=$(pwd) sd_prog=$(pwd)
cd_or_exit "$sd_cwd" cd "$sd_cwd" || exit $?
# linked build needs additional settings # linked build needs additional settings
if [ -e "${sd_prog}/ooenv" ] ; then if [ -e "${sd_prog}/ooenv" ] ; then

13
desktop/scripts/unopkg.sh
View File

@@ -21,26 +21,19 @@
SAL_ENABLE_FILE_LOCKING=1 SAL_ENABLE_FILE_LOCKING=1
export SAL_ENABLE_FILE_LOCKING export SAL_ENABLE_FILE_LOCKING
cd_or_exit() {
if ! cd "$1"; then
echo "Can't cd to $1"
exit 1
fi
}
# resolve installation directory # resolve installation directory
sd_cwd=$(pwd) sd_cwd=$(pwd)
sd_res="$0" sd_res="$0"
while [ -h "$sd_res" ] ; do while [ -h "$sd_res" ] ; do
sd_dirname=$(dirname "$sd_res") sd_dirname=$(dirname "$sd_res")
cd_or_exit "$sd_dirname" cd "$sd_dirname" || exit $?
sd_basename=$(basename "$sd_res") sd_basename=$(basename "$sd_res")
sd_res=$(ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g") sd_res=$(ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g")
done done
sd_dirname=$(dirname "$sd_res") sd_dirname=$(dirname "$sd_res")
cd_or_exit "$sd_dirname" cd "$sd_dirname" || exit $?
sd_prog=$(pwd) sd_prog=$(pwd)
cd_or_exit "$sd_cwd" cd "$sd_cwd" || exit $?
# this is a temporary hack until we can live with the default search paths # this is a temporary hack until we can live with the default search paths
case "$(uname -s)" in case "$(uname -s)" in