blob: 5b592beb80e5ce8959433e93b4e7b065fb109311 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- bin/distro-install-desktop-integration.orig 2017-05-03 16:46:29 UTC
+++ bin/distro-install-desktop-integration
@@ -99,7 +99,7 @@ cp -a workdir/CustomTarget/sysui/share/libreoffice/* "
cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp"
cd $sysui_temp
# we want non-versioned stuff in the distro packages
-sed -i \
+sed -i "" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
@@ -109,13 +109,13 @@ sed -i \
export OFFICE_PREFIX=$LIBDIR
export PREFIX=$INSTALLDIRNAME
export ICON_PREFIX=$INSTALLDIRNAME
- export ICON_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/icons
+ export ICON_SOURCE_DIR="${SRCDIR}"/sysui/desktop/icons
export PRODUCTVERSION=
export KDEMAINDIR=$PREFIXDIR
export PREFIXDIR=${PREFIXDIR}
export GNOMEDIR=$PREFIXDIR
export GNOME_MIME_THEME=hicolor
- export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata
+ export APPDATA_SOURCE_DIR="${SRCDIR}"/sysui/desktop/appstream-appdata
bash ./create_tree.sh
)
cd -
@@ -130,7 +130,7 @@ fi
# we want non-versioned desktop files
cd $DESTDIR/$INSTALLDIR/share/xdg
# we want non-versioned stuff in the distro packages
-sed -i \
+sed -i "" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
@@ -145,7 +145,7 @@ if test -f $DESTDIR/gid_Module_Root_Brand ; then
$PREFIXDIR/share/mime/packages \
$PREFIXDIR/share/mime-info \
$PREFIXDIR/share/icons ; do
- find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand
+ find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand
done
fi
@@ -177,12 +177,12 @@ ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/
test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand
# create bash completion
-mkdir -p $DESTDIR/usr/share/bash-completion/completions
-"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions
+"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
- "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
- test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+ "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh
+ test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
fi
echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
|
