Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 2d_appimage.sh #1526

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Update 2d_appimage.sh #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ca5c83
Update 2d_appimage.sh
johnnynunez Aug 30, 2024
6b56ea9
Update Dockerfile
johnnynunez Aug 30, 2024
f9d95b8
arm linuxdeploy
johnnynunez Aug 30, 2024
7eb9150
Update Dockerfile
johnnynunez Aug 30, 2024
1e8ef80
Fix build
johnnynunez Sep 2, 2024
826c9fc
Update 2d_appimage.sh
johnnynunez Sep 2, 2024
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
10 changes: 8 additions & 2 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
python3 \
python3-pip \
unzip \
wget
wget \
file \
desktop-file-utils

RUN pip3 install aqtinstall

Expand All @@ -66,6 +68,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 @@ -78,4 +84,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
View file
Open in desktop
Binary file not shown.
Binary file added resources/linux/linuxdeploy-arm/linuxdeploy-plugin-appimage
View file
Open in desktop
Binary file not shown.
Binary file added resources/linux/linuxdeploy-arm/linuxdeploy-plugin-qt
View file
Open in desktop
Binary file not shown.
24 changes: 22 additions & 2 deletions scripts/Linux/internal/2d_appimage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,23 @@ case $i in
esac
done

# 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

$RESOURCES_PATH/linux/linuxdeploy --appdir=$INSTALL_PATH \
--output appimage

Expand All @@ -35,5 +52,8 @@ ML_VERSION=${strarr[1]} #get the meshlab version from the string
# get running architecture
ARCH=$(uname -m)

mkdir $PACKAGES_PATH
mv MeshLab-*.AppImage $PACKAGES_PATH/MeshLab$ML_VERSION-linux_$ARCH.AppImage
# Ensure the packages path exists
mkdir -p $PACKAGES_PATH

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