fix: apps shortcut

bin/install.sh

@@ -1,11 +1,10 @@
 #!/bin/bash -e
 
-su - -c "chown app: '$HOME'"
-#cat <<EOF >> "$HOME/.bashrc"
-#export FAKETIME='$(date '+%Y-%m-%d 00:00:00')'
-#EOF
+mkdir -p /app/bin/
 
-ln -sf /app/.cxoffice/Microsoft_Office_2016/desktopdata/cxmenu/Shortcuts/cxoffice-fe00-*-1697392954.excel    /app/bin/excel
-ln -sf /app/.cxoffice/Microsoft_Office_2016/desktopdata/cxmenu/Shortcuts/cxoffice-fe00-*-1697392954.powerpnt /app/bin/powerpoint
-ln -sf /app/.cxoffice/Microsoft_Office_2016/desktopdata/cxmenu/Shortcuts/cxoffice-fe00-*-1697392954.winword  /app/bin/word
-exec "$@"
+/opt/cxoffice/bin/cxinstaller
+ln -sf /app/.cxoffice/Microsoft_Office_2016/desktopdata/cxmenu/Shortcuts/cxoffice*.excel    /app/bin/excel
+ln -sf /app/.cxoffice/Microsoft_Office_2016/desktopdata/cxmenu/Shortcuts/cxoffice*.powerpnt /app/bin/powerpoint
+ln -sf /app/.cxoffice/Microsoft_Office_2016/desktopdata/cxmenu/Shortcuts/cxoffice*.winword  /app/bin/word
+
+su - -c "chown app: '$HOME'"

get_office.sh

@@ -1,18 +1,19 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 # https://answers.microsoft.com/en-us/msoffice/forum/all/useful-microsoft-download-links-for-office-direct/7bcaa971-9493-44b6-a1ba-0db4c6957c47
 
-# Office 2016 Home & Student
-URL='http://officecdn.microsoft.com/pr/492350f6-3a01-4f97-b9c0-c7c6ddf67d60/media/en-us/HomeStudentRetail.img'
+# Office 2016 Pro Plus fr-FR
+URL='https://officecdn.microsoft.com/db/492350F6-3A01-4F97-B9C0-C7C6DDF67D60/media/fr-fr/ProPlusRetail.img'
 
-curl -C- -o O2016HS.img "$URL"
+ISO=O2016PP.img
 
-DEV="$(udisksctl loop-setup -f O2016HS.img | awk '{print $NF}' | awk 1 RS='.\n')"
-DIR="$(udisksctl mount -b "$DEV" | awk '{print $NF}')"
+curl -C- -o "$ISO" "$URL"
 
-cp -Trv "$DIR" office/ || true
+echo "$ISO"
 
-umount "$DIR"
-udisksctl loop-delete -b "$DEV"
-
-find office/ -type d -exec chmod 755 '{}' + -o -type f -exec chmod 644 {} +
+#cp -Trv "$DIR" office/ || true
+#
+#umount "$DIR"
+#udisksctl loop-delete -b "$DEV"
+#
+#find office/ -type d -exec chmod 755 '{}' + -o -type f -exec chmod 644 {} +

install.sh

@@ -11,7 +11,10 @@ if [ -z "$WAYLAND_DISPLAY" ]; then
     )
 fi
 
-[ -d office/ ] || ./get_office.sh
+ISO="$(./get_office.sh)"
+
+DEV="$(udisksctl loop-setup -f "$ISO" | awk '{print $NF}' | awk 1 RS='.\n')"
+OFFICE="$(udisksctl mount -b "$DEV" | awk '{print $NF}')"
 
 "${CRI[@]}" volume create -o=o=uid=1000 office || true
 
@@ -25,8 +28,10 @@ fi
     -v /tmp/.X11-unix/:/tmp/.X11-unix         \
     -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR"    \
     -v /usr/share/fonts/:/usr/share/fonts/:ro \
-    -v "$PWD:/mnt/:ro"                        \
+    -v "$OFFICE:/mnt/:ro"                     \
     -v office://app/                          \
     --entrypoint install.sh                   \
     office                                    \
     /opt/cxoffice/bin/cxinstaller
+
+umount "$OFFICE"