Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ RUN wget -qO- "https://cmake.org/files/v3.19/cmake-3.19.2-Linux-x86_64.tar.gz" \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*

RUN wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage \
&& chmod +x appimagetool-x86_64.AppImage \
&& mv appimagetool-x86_64.AppImage /usr/local/bin/appimagetool

# Generating a universally unique ID for the Container
RUN dbus-uuidgen > /etc/machine-id

Expand All @@ -79,4 +83,4 @@ RUN groupadd --gid $USER_GID $USERNAME \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME

USER $USERNAME
USER $USERNAME
Binary file added resources/linux/linuxdeploy-arm/linuxdeploy
Binary file not shown.
Binary file not shown.
Binary file not shown.
22 changes: 21 additions & 1 deletion scripts/Linux/internal/2d_appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,24 @@ case $i in
esac
done

ARCH=$(uname -m)
# Ensure appimagetool is in the PATH
if ! command -v appimagetool &> /dev/null
then
echo "appimagetool could not be found, attempting to install it..."
wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage \
&& chmod +x appimagetool-x86_64.AppImage \
&& sudo mv appimagetool-x86_64.AppImage /usr/local/bin/appimagetool

if ! command -v appimagetool &> /dev/null
then
echo "Failed to install appimagetool. Please install it manually."
exit 1
fi
else
echo "appimagetool is already installed."
fi

ARCH=$(uname -m)
$RESOURCES_PATH/linux/$ARCH/linuxdeploy --appdir=$INSTALL_PATH \
--output appimage

Expand All @@ -34,5 +50,9 @@ STR_VERSION=$($INSTALL_PATH/AppRun --version)
read -a strarr <<< "$STR_VERSION"
ML_VERSION=${strarr[1]} #get the meshlab version from the string

# Ensure the packages path exists
mkdir -p $PACKAGES_PATH

# Move the AppImage to the packages directory
mkdir -p $PACKAGES_PATH
mv MeshLab-*.AppImage $PACKAGES_PATH/MeshLab$ML_VERSION-linux_$ARCH.AppImage