Skip to content

Commit f2688c6

Browse files
author
CIS Guru
committed
Updated bump-version script to include electron.manifest.json. Updated install script to install to Aquiis folder instead of root Applications folder.
1 parent f6f39eb commit f2688c6

5 files changed

Lines changed: 54 additions & 37 deletions

File tree

4-Aquiis.SimpleStart/Aquiis.SimpleStart.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<MigrationsDirectory>Data/Migrations</MigrationsDirectory>
99

1010
<!-- Semantic Versioning -->
11-
<Version>1.1.2</Version>
12-
<AssemblyVersion>1.1.2.0</AssemblyVersion>
13-
<FileVersion>1.1.2.0</FileVersion>
14-
<InformationalVersion>1.1.2</InformationalVersion>
11+
<Version>1.1.3</Version>
12+
<AssemblyVersion>1.1.3.0</AssemblyVersion>
13+
<FileVersion>1.1.3.0</FileVersion>
14+
<InformationalVersion>1.1.3</InformationalVersion>
1515
</PropertyGroup>
1616

1717
<ItemGroup>

4-Aquiis.SimpleStart/Assets/install-desktop-integration.sh

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,19 @@ echo "AppImage: $APPIMAGE_NAME"
5252
echo "Location: $APPIMAGE_DIR"
5353
echo ""
5454

55-
# Create Applications directory
56-
mkdir -p ~/Applications
57-
58-
# Move AppImage to ~/Applications/ if not already there
59-
if [[ "$APPIMAGE_DIR" != "$HOME/Applications" ]]; then
60-
echo "Moving AppImage to ~/Applications/..."
61-
mv "$APPIMAGE_PATH" ~/Applications/
62-
APPIMAGE_PATH="$HOME/Applications/$APPIMAGE_NAME"
63-
APPIMAGE_DIR="$HOME/Applications"
55+
# Create application directory (app-specific subfolder avoids collisions)
56+
APP_INSTALL_DIR="$HOME/Applications/Aquiis"
57+
mkdir -p "$APP_INSTALL_DIR"
58+
59+
# Move AppImage to ~/Applications/Aquiis/ if not already there
60+
if [[ "$APPIMAGE_DIR" != "$APP_INSTALL_DIR" ]]; then
61+
echo "Moving AppImage to $APP_INSTALL_DIR/..."
62+
mv "$APPIMAGE_PATH" "$APP_INSTALL_DIR/"
63+
APPIMAGE_PATH="$APP_INSTALL_DIR/$APPIMAGE_NAME"
64+
APPIMAGE_DIR="$APP_INSTALL_DIR"
6465
echo -e "${GREEN}✓ Moved to: $APPIMAGE_PATH${NC}"
6566
else
66-
echo "✓ AppImage already in ~/Applications/"
67+
echo "✓ AppImage already in $APP_INSTALL_DIR/"
6768
fi
6869

6970
# Make AppImage executable
@@ -76,28 +77,36 @@ echo ""
7677
mkdir -p ~/.local/share/applications
7778
mkdir -p ~/.local/share/icons/hicolor/512x512/apps
7879

79-
# Check if icon exists in same directory
80-
ICON_PATH="${APPIMAGE_DIR}/aquiis-icon.png"
81-
if [ ! -f "$ICON_PATH" ]; then
82-
# Try to find icon.png in same directory
83-
ICON_PATH="${APPIMAGE_DIR}/icon.png"
84-
85-
if [ ! -f "$ICON_PATH" ]; then
86-
echo -e "${YELLOW}Warning: Icon file not found. Using generic AppImage icon.${NC}"
87-
ICON_PATH="application-x-executable"
88-
else
89-
# Copy icon to system location
90-
cp "$ICON_PATH" ~/.local/share/icons/hicolor/512x512/apps/aquiis.png
91-
ICON_PATH="aquiis"
92-
echo "✓ Copied icon to system icons directory"
93-
fi
94-
else
95-
# Copy icon to system location
96-
cp "$ICON_PATH" ~/.local/share/icons/hicolor/512x512/apps/aquiis.png
80+
# Extract icon from inside the AppImage.
81+
# Note: selective extraction (passing a filename to --appimage-extract) is not
82+
# supported by all runtimes -- always do a full extract then pick the file out.
83+
ICON_PATH="application-x-executable"
84+
EXTRACT_WORKDIR="$(mktemp -d)"
85+
86+
echo "Extracting icon from AppImage..."
87+
(cd "$EXTRACT_WORKDIR" && "$APPIMAGE_PATH" --appimage-extract > /dev/null 2>&1) || true
88+
89+
if [ -f "$EXTRACT_WORKDIR/squashfs-root/usr/share/icons/hicolor/512x512/apps/aquiis.png" ]; then
90+
cp "$EXTRACT_WORKDIR/squashfs-root/usr/share/icons/hicolor/512x512/apps/aquiis.png" \
91+
~/.local/share/icons/hicolor/512x512/apps/aquiis.png
92+
ICON_PATH="aquiis"
93+
echo "✓ Extracted and installed icon from AppImage"
94+
elif [ -f "$EXTRACT_WORKDIR/squashfs-root/aquiis.png" ]; then
95+
cp "$EXTRACT_WORKDIR/squashfs-root/aquiis.png" \
96+
~/.local/share/icons/hicolor/512x512/apps/aquiis.png
9797
ICON_PATH="aquiis"
98-
echo "✓ Copied icon to system icons directory"
98+
echo "✓ Extracted and installed icon from AppImage"
99+
elif [ -L "$EXTRACT_WORKDIR/squashfs-root/.DirIcon" ] || [ -f "$EXTRACT_WORKDIR/squashfs-root/.DirIcon" ]; then
100+
cp -L "$EXTRACT_WORKDIR/squashfs-root/.DirIcon" \
101+
~/.local/share/icons/hicolor/512x512/apps/aquiis.png
102+
ICON_PATH="aquiis"
103+
echo "✓ Extracted and installed icon from AppImage (.DirIcon)"
104+
else
105+
echo -e "${YELLOW}Warning: Could not extract icon from AppImage. Using generic icon.${NC}"
99106
fi
100107

108+
rm -rf "$EXTRACT_WORKDIR"
109+
101110
# Create desktop entry
102111
cat > ~/.local/share/applications/aquiis.desktop << EOF
103112
[Desktop Entry]
@@ -129,7 +138,10 @@ fi
129138

130139
# Update icon cache
131140
if command -v gtk-update-icon-cache &> /dev/null; then
132-
gtk-update-icon-cache ~/.local/share/icons/hicolor/ 2>/dev/null || true
141+
gtk-update-icon-cache -f -t ~/.local/share/icons/hicolor/ 2>/dev/null || true
142+
echo "✓ Updated icon cache"
143+
elif command -v xdg-icon-resource &> /dev/null; then
144+
xdg-icon-resource forceupdate 2>/dev/null || true
133145
echo "✓ Updated icon cache"
134146
fi
135147

@@ -150,5 +162,5 @@ echo " rm ~/.local/share/icons/hicolor/512x512/apps/aquiis.png"
150162
echo " update-desktop-database ~/.local/share/applications/"
151163
echo ""
152164
echo "To completely remove Aquiis:"
153-
echo " rm $APPIMAGE_PATH"
165+
echo " rm -rf $APP_INSTALL_DIR"
154166
echo ""

4-Aquiis.SimpleStart/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ApplicationSettings": {
1515
"AppName": "Aquiis",
1616
"ProductName": "Aquiis SimpleStart",
17-
"Version": "1.1.2",
17+
"Version": "1.1.3",
1818
"Author": "CIS Guru",
1919
"Email": "cisguru@outlook.com",
2020
"Repository": "https://github.com/xnodeoncode/Aquiis",

4-Aquiis.SimpleStart/electron.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"appId": "com.aquiis.propertymanagement",
1818
"productName": "Aquiis",
1919
"copyright": "Copyright © 2026",
20-
"buildVersion": "1.1.2",
20+
"buildVersion": "1.1.3",
2121
"compression": "normal",
2222
"directories": {
2323
"output": "../../../bin/Desktop"

bump-version.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ set -e
88
VERSION_TYPE="${1:-patch}"
99
CSPROJ_FILE="4-Aquiis.SimpleStart/Aquiis.SimpleStart.csproj"
1010
APPSETTINGS_FILE="4-Aquiis.SimpleStart/appsettings.json"
11+
ELECTRON_MANIFEST="4-Aquiis.SimpleStart/electron.manifest.json"
1112

1213
# Colors for output
1314
RED='\033[0;31m'
@@ -80,6 +81,10 @@ sed -i "s|<InformationalVersion>$CURRENT_VERSION</InformationalVersion>|<Informa
8081
echo -e "${YELLOW}📝 Updating $APPSETTINGS_FILE...${NC}"
8182
sed -i "s|\"Version\": \"$CURRENT_VERSION\"|\"Version\": \"$NEW_VERSION\"|g" "$APPSETTINGS_FILE"
8283

84+
# Update electron.manifest.json buildVersion
85+
echo -e "${YELLOW}📝 Updating $ELECTRON_MANIFEST...${NC}"
86+
sed -i "s|\"buildVersion\": \"[^\"]*\"|\"buildVersion\": \"$NEW_VERSION\"|g" "$ELECTRON_MANIFEST"
87+
8388
# Update database settings if MAJOR or MINOR version changed
8489
if [ "$VERSION_TYPE" == "major" ] || [ "$VERSION_TYPE" == "minor" ]; then
8590
echo -e "${YELLOW}📝 Updating database version to app_v${DB_VERSION}.db...${NC}"

0 commit comments

Comments
 (0)