Fixed problem with zip file not keeping permissions

Bram-Hub · Apr 12, 2018 · 0b74a03 · 0b74a03
1 parent 0379502
commit 0b74a03
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/libaris/res/edu/rpi/aris/VERSION b/libaris/res/edu/rpi/aris/VERSION
@@ -1 +1 @@
-0.0.42
+0.0.43
diff --git a/libaris/src/edu/rpi/aris/Update.java b/libaris/src/edu/rpi/aris/Update.java
@@ -169,10 +169,10 @@ private void unzipFile(File file) throws IOException {
                 ZipEntry entry = entries.nextElement();
                 File entryDestination = new File(Update.UPDATE_DOWNLOAD_DIR, entry.getName());
                 if (entry.isDirectory()) {
-                    if (!entryDestination.mkdirs())
+                    if (!entryDestination.exists() && !entryDestination.mkdirs())
                         throw new IOException("Failed to unzip file: " + file.getCanonicalPath());
                 } else {
-                    if (!entryDestination.getParentFile().mkdirs())
+                    if (!entryDestination.getParentFile().exists() && !entryDestination.getParentFile().mkdirs())
                         throw new IOException("Failed to unzip file: " + file.getCanonicalPath());
                     try (InputStream in = zipFile.getInputStream(entry);
                          OutputStream out = new FileOutputStream(entryDestination)) {

diff --git a/packaging/extra/server/bin/aris-server b/packaging/extra/server/bin/aris-server
@@ -45,6 +45,7 @@ run_aris() {
             echo -n Updating aris ...
             rm -rf /usr/lib/aris/*
             cp -r $TMP/aris-update/* /usr/lib/aris
+            chmod +x /usr/lib/aris/bin/*
             echo " Done"
         fi
     done

diff --git a/packaging/extra/server/bin/aris-update b/packaging/extra/server/bin/aris-update
@@ -43,6 +43,7 @@ update_aris() {
         echo -n Updating aris ...
         rm -rf /usr/lib/aris/*
         cp -r $TMP/aris-update/* /usr/lib/aris
+        chmod +x /usr/lib/aris/bin/*
         echo " Done"
     fi
 }