diff --git a/config/fppconfig.tar.gz b/config/fppconfig.tar.gz new file mode 100644 index 0000000..7bcbe85 Binary files /dev/null and b/config/fppconfig.tar.gz differ diff --git a/config/2.25-fppconfig.tar.gz b/config/legacy/2.25-fppconfig.tar.gz similarity index 100% rename from config/2.25-fppconfig.tar.gz rename to config/legacy/2.25-fppconfig.tar.gz diff --git a/create_appimage.sh b/create_appimage.sh index 5d547af..2961fef 100755 --- a/create_appimage.sh +++ b/create_appimage.sh @@ -4,7 +4,7 @@ set -e cd Ishiiruka -ZSYNC_STRING="gh-releases-zsync|Birdthulu|FPM-AppImage|latest|Faster_Project_Plus-x86_64.AppImage.zsync" +ZSYNC_STRING="gh-releases-zsync|jlambert360|FPM-AppImage|latest|Faster_Project_Plus-x86-64.AppImage.zsync" LINUXDEPLOY_PATH="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous" LINUXDEPLOY_FILE="linuxdeploy-x86_64.AppImage" @@ -45,7 +45,7 @@ cp ./Tools/${UPDATETOOL_FILE} ${APPDIR_BIN} # Bake an AppImage with the update metadata export UPDATE_INFORMATION="${ZSYNC_STRING}"; -export VERSION="2.25" +export VERSION="2.28" ./Tools/${UPDATEPLUG_FILE} --appdir=./build/AppDir/; mv Faster_Project_Plus-$VERSION-x86_64.AppImage Faster_Project_Plus-x86-64.AppImage diff --git a/setup_appimage b/setup_appimage index 6d566ae..dcf3679 100755 --- a/setup_appimage +++ b/setup_appimage @@ -40,14 +40,12 @@ UBPATCH=1 ARPATCH=0 # --- -FPPVERSION="2.25" +FPPVERSION="2.28" CONFIGNAME="fppconfig" -COMMITHASH="0311660c433eb04755c93160bdfe1ea516364c68" -CONFIGLINK="https://github.com/Birdthulu/FPM-Installer/raw/master/config/$FPPVERSION-$CONFIGNAME.tar.gz" -GITCLONELINK="https://github.com/Birdthulu/Ishiiruka" -SdCardFileName="2.2+Final+Fixed+SD.raw" -SdCardDlHash="2wy1q6btypdjnor" -SdCardLink="http://www.mediafire.com/file/$SdCardDlHash/$SdCardFileName/file" +COMMITHASH="75123e34eac5b0f3204f32a116c389f95da0766a" +CONFIGLINK="https://github.com/jlambert360/FPM-Installer/raw/master/config/$CONFIGNAME.tar.gz" +GITCLONELINK="https://github.com/jlambert360/Ishiiruka" +SdCardLink="https://github.com/jlambert360/FPM-AppImage/releases/download/v$FPPVERSION/ProjectPlusSd$FPPVERSION.tar.gz" echo "Installing version $FPPVERSION!" # Set FOLDERNAME based on FPP version @@ -174,10 +172,10 @@ echo "cmaking..." if [ ! -z "${IN_NIX_SHELL++}" ]; then cmake .. -DLINUX_LOCAL_DEV=true -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2}/lib/gtk-2.0 -DENABLE_LTO=True -DCMAKE_INSTALL_PREFIX=/usr else - cmake .. -DLINUX_LOCAL_DEV=true -DCMAKE_INSTALL_PREFIX=/usr -DVERSION_TAG="2.2.0" + cmake .. -DLINUX_LOCAL_DEV=true -DCMAKE_INSTALL_PREFIX=/usr -DVERSION_TAG="$FPPVERSION" fi echo "Compiling..." -make -j $CPUS -s BUILD_TAG=2.2.0 +make -j $CPUS -s BUILD_TAG=$FPPVERSION touch ./Binaries/portable.txt cp ../../faster-project-plus.desktop ../Data/ishiiruka.desktop;