From b02620c835c5dc151270866fbaf4049213e84976 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 22 Jun 2016 10:40:04 -0400 Subject: [PATCH] refactor: group AppImage related stuff (#498) Currently we had AppImage scripts and other resources in various different places in the code base. Signed-off-by: Juan Cruz Viotti --- scripts/{ => build/AppImages}/AppImageAssistant-x64 | Bin scripts/{ => build/AppImages}/AppImageAssistant-x86 | Bin scripts/{ => build/AppImages}/AppRun-x64 | Bin scripts/{ => build/AppImages}/AppRun-x86 | Bin .../build/AppImages/Etcher.desktop | 0 scripts/{ => build/AppImages}/desktopintegration | 0 scripts/build/linux.sh | 8 ++++---- 7 files changed, 4 insertions(+), 4 deletions(-) rename scripts/{ => build/AppImages}/AppImageAssistant-x64 (100%) rename scripts/{ => build/AppImages}/AppImageAssistant-x86 (100%) rename scripts/{ => build/AppImages}/AppRun-x64 (100%) rename scripts/{ => build/AppImages}/AppRun-x86 (100%) rename Etcher.desktop => scripts/build/AppImages/Etcher.desktop (100%) rename scripts/{ => build/AppImages}/desktopintegration (100%) diff --git a/scripts/AppImageAssistant-x64 b/scripts/build/AppImages/AppImageAssistant-x64 similarity index 100% rename from scripts/AppImageAssistant-x64 rename to scripts/build/AppImages/AppImageAssistant-x64 diff --git a/scripts/AppImageAssistant-x86 b/scripts/build/AppImages/AppImageAssistant-x86 similarity index 100% rename from scripts/AppImageAssistant-x86 rename to scripts/build/AppImages/AppImageAssistant-x86 diff --git a/scripts/AppRun-x64 b/scripts/build/AppImages/AppRun-x64 similarity index 100% rename from scripts/AppRun-x64 rename to scripts/build/AppImages/AppRun-x64 diff --git a/scripts/AppRun-x86 b/scripts/build/AppImages/AppRun-x86 similarity index 100% rename from scripts/AppRun-x86 rename to scripts/build/AppImages/AppRun-x86 diff --git a/Etcher.desktop b/scripts/build/AppImages/Etcher.desktop similarity index 100% rename from Etcher.desktop rename to scripts/build/AppImages/Etcher.desktop diff --git a/scripts/desktopintegration b/scripts/build/AppImages/desktopintegration similarity index 100% rename from scripts/desktopintegration rename to scripts/build/AppImages/desktopintegration diff --git a/scripts/build/linux.sh b/scripts/build/linux.sh index bc4c0ffe..78c9b762 100755 --- a/scripts/build/linux.sh +++ b/scripts/build/linux.sh @@ -135,11 +135,11 @@ function app_dir_create { output_directory=$3 mkdir -p $output_directory/usr/bin - cp ./scripts/AppRun-$architecture $output_directory/AppRun - cp ./Etcher.desktop $output_directory + cp ./scripts/build/AppImages/AppRun-$architecture $output_directory/AppRun + cp ./scripts/build/AppImages/Etcher.desktop $output_directory cp ./assets/icon.png $output_directory cp -rf $source_directory/* $output_directory/usr/bin - cp ./scripts/desktopintegration $output_directory/usr/bin/etcher.wrapper + cp ./scripts/build/AppImages/desktopintegration $output_directory/usr/bin/etcher.wrapper } function installer { @@ -152,7 +152,7 @@ function installer { mkdir -p $output_directory app_dir_create $source_directory $architecture $appdir_temporary_location rm -f $output_file - ./scripts/AppImageAssistant-$architecture $appdir_temporary_location $output_file + ./scripts/build/AppImages/AppImageAssistant-$architecture $appdir_temporary_location $output_file rm -rf $appdir_temporary_location }