package: avoid non-portable ln options

The options present in the 'ln' command differ between Linux and MacOS ('-r'
in the former creates a relative link from absolute paths, '-F' in the
latter forces overwriting an existing link). Drop use of these options in
packaging/installation scripts by instead explicitly specifying relative
paths and deleting existing links before calling 'ln', respectively.

Signed-off-by: Victoria Dye <[email protected]>

Author: vdye

build/package/layout-unix.sh

@@ -48,28 +48,31 @@ if [ -d "$PAYLOAD" ]; then
 fi
 
 # Ensure payload directory exists
-INSTALL_TO="$PAYLOAD/usr/local/git-bundle-server"
-mkdir -p "$INSTALL_TO"
+APP_ROOT="$PAYLOAD/usr/local/git-bundle-server"
+mkdir -p "$APP_ROOT"
 
 # Copy built binaries
 echo "Copying binaries..."
-cp -R "$BINDIR/." "$INSTALL_TO/bin"
+cp -R "$BINDIR/." "$APP_ROOT/bin"
 
 # Copy uninstaller script
 if [ -n "$UNINSTALLER" ]; then
 	echo "Copying uninstall script..."
-	cp "$UNINSTALLER" "$INSTALL_TO"
+	cp "$UNINSTALLER" "$APP_ROOT"
 fi
 
 # Create symlinks
 if [ -n "$INCLUDE_SYMLINKS" ]; then
 	LINK_TO="$PAYLOAD/usr/local/bin"
+	RELATIVE_LINK_TO_BIN="../git-bundle-server/bin"
 	mkdir -p "$LINK_TO"
 
-	echo "Creating symlinks..."
-	for program in "$INSTALL_TO"/bin/*
+	echo "Creating binary symlinks..."
+	for program in "$APP_ROOT"/bin/*
 	do
-		ln -s -r "$program" "$LINK_TO/$(basename $program)"
+		p=$(basename "$program")
+		rm -f "$LINK_TO/$p"
+		ln -s "$RELATIVE_LINK_TO_BIN/$p" "$LINK_TO/$p"
 	done
 fi
 

build/package/pkg/scripts/postinstall

@@ -5,15 +5,17 @@ PACKAGE=$1
 INSTALL_DESTINATION=$2
 
 # Directories
-INSTALL_TO="$INSTALL_DESTINATION/usr/local/git-bundle-server/"
-LINK_TO="$INSTALL_DESTINATION/usr/local/bin/"
-RELATIVE_LINK_TO_INSTALL="../git-bundle-server"
+APP_ROOT="$INSTALL_DESTINATION/usr/local/git-bundle-server"
+LINK_TO="$INSTALL_DESTINATION/usr/local/bin"
+RELATIVE_LINK_TO_BIN="../git-bundle-server/bin"
 mkdir -p "$LINK_TO"
 
 # Create symlinks
-for program in "$INSTALL_TO"/bin/*
+for program in "$APP_ROOT"/bin/*
 do
-	/bin/ln -Fs "$RELATIVE_LINK_TO_INSTALL/bin/$(basename $program)" "$LINK_TO/$(basename $program)"
+	p=$(basename "$program")
+	rm -f "$LINK_TO/$p"
+	ln -s "$RELATIVE_LINK_TO_BIN/$p" "$LINK_TO/$p"
 done
 
 exit 0